mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-18 03:59:14 +01:00
822326eea9
From wxWidgets master 81570ae070b35c9d52de47b1f14897f3ff1a66c7. include/wx/defs.h -- __w64 warning disable patch by comex brought forward. include/wx/msw/window.h -- added GetContentScaleFactor() which was not implemented on Windows but is necessary for wxBitmap scaling on Mac OS X so it needs to work to avoid #ifdef-ing the code. src/gtk/window.cpp -- Modified DoSetClientSize() to direct call wxWindowGTK::DoSetSize() instead of using public wxWindowBase::SetSize() which now prevents derived classes (like wxAuiToolbar) intercepting the call and breaking it. This matches Windows which does NOT need to call DoSetSize internally. End result is this fixes Dolphin's debug tools toolbars on Linux. src/osx/window_osx.cpp -- Same fix as for GTK since it has the same issue. src/msw/radiobox.cpp -- Hacked to fix display in HiDPI (was clipping off end of text). Updated CMakeLists for Linux and Mac OS X. Small code changes to Dolphin to fix debug error boxes, deprecation warnings, and retain previous UI behavior on Windows.
82 lines
2.8 KiB
C++
82 lines
2.8 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/osx/carbon/private/print.h
|
|
// Purpose: private implementation for printing on OS X
|
|
// Author: Stefan Csomor
|
|
// Modified by:
|
|
// Created: 03/02/99
|
|
// Copyright: (c) Stefan Csomor
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_MAC_PRIVATE_PRINT_H_
|
|
#define _WX_MAC_PRIVATE_PRINT_H_
|
|
|
|
#include "wx/cmndata.h"
|
|
#include "wx/print.h"
|
|
|
|
// for PrintingManager
|
|
#include "ApplicationServices/ApplicationServices.h"
|
|
|
|
class WXDLLIMPEXP_CORE wxOSXPrintData : public wxPrintNativeDataBase
|
|
{
|
|
public:
|
|
wxOSXPrintData();
|
|
virtual ~wxOSXPrintData();
|
|
|
|
virtual bool TransferTo( wxPrintData &data );
|
|
virtual bool TransferFrom( const wxPrintData &data );
|
|
|
|
virtual bool IsOk() const ;
|
|
|
|
virtual void TransferFrom( const wxPageSetupDialogData * );
|
|
virtual void TransferTo( wxPageSetupDialogData * );
|
|
|
|
virtual void TransferFrom( const wxPrintDialogData * );
|
|
virtual void TransferTo( wxPrintDialogData * );
|
|
|
|
PMPrintSession GetPrintSession() { return m_macPrintSession; }
|
|
PMPageFormat GetPageFormat() { return m_macPageFormat; }
|
|
PMPrintSettings GetPrintSettings() { return m_macPrintSettings; }
|
|
protected :
|
|
virtual void TransferPrinterNameFrom( const wxPrintData &data );
|
|
virtual void TransferPaperInfoFrom( const wxPrintData &data );
|
|
virtual void TransferResolutionFrom( const wxPrintData &data );
|
|
|
|
virtual void TransferPrinterNameTo( wxPrintData &data );
|
|
virtual void TransferPaperInfoTo( wxPrintData &data );
|
|
virtual void TransferResolutionTo( wxPrintData &data );
|
|
|
|
|
|
virtual void UpdateFromPMState();
|
|
virtual void UpdateToPMState();
|
|
|
|
PMPrintSession m_macPrintSession ;
|
|
PMPageFormat m_macPageFormat ;
|
|
PMPrintSettings m_macPrintSettings ;
|
|
PMPaper m_macPaper;
|
|
private:
|
|
wxDECLARE_DYNAMIC_CLASS(wxOSXPrintData);
|
|
} ;
|
|
|
|
WXDLLIMPEXP_CORE wxPrintNativeDataBase* wxOSXCreatePrintData();
|
|
|
|
#if wxOSX_USE_COCOA
|
|
class WXDLLIMPEXP_CORE wxOSXCocoaPrintData : public wxOSXPrintData
|
|
{
|
|
public:
|
|
wxOSXCocoaPrintData();
|
|
virtual ~wxOSXCocoaPrintData();
|
|
|
|
WX_NSPrintInfo GetNSPrintInfo() { return m_macPrintInfo; }
|
|
protected:
|
|
virtual void UpdateFromPMState();
|
|
virtual void UpdateToPMState();
|
|
|
|
WX_NSPrintInfo m_macPrintInfo;
|
|
private:
|
|
wxDECLARE_DYNAMIC_CLASS(wxOSXCocoaPrintData);
|
|
} ;
|
|
#endif
|
|
|
|
#endif // _WX_MAC_PRIVATE_PRINT_H_
|