mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-15 18:49:11 +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.
126 lines
3.8 KiB
C++
126 lines
3.8 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/printdlg.h
|
|
// Purpose: wxPrintDialog, wxPageSetupDialog classes
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 01/02/97
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_PRINTDLG_H_
|
|
#define _WX_PRINTDLG_H_
|
|
|
|
#if wxUSE_PRINTING_ARCHITECTURE
|
|
|
|
#include "wx/dialog.h"
|
|
#include "wx/cmndata.h"
|
|
#include "wx/prntbase.h"
|
|
#include "wx/printdlg.h"
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxDC;
|
|
class WinPrinter;
|
|
|
|
//----------------------------------------------------------------------------
|
|
// wxWindowsPrintNativeData
|
|
//----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxWindowsPrintNativeData: public wxPrintNativeDataBase
|
|
{
|
|
public:
|
|
wxWindowsPrintNativeData();
|
|
virtual ~wxWindowsPrintNativeData();
|
|
|
|
virtual bool TransferTo( wxPrintData &data );
|
|
virtual bool TransferFrom( const wxPrintData &data );
|
|
|
|
virtual bool Ok() const { return IsOk(); }
|
|
virtual bool IsOk() const;
|
|
|
|
void InitializeDevMode(const wxString &printerName = wxEmptyString, WinPrinter* printer = NULL);
|
|
void* GetDevMode() const { return m_devMode; }
|
|
void SetDevMode(void* data) { m_devMode = data; }
|
|
void* GetDevNames() const { return m_devNames; }
|
|
void SetDevNames(void* data) { m_devNames = data; }
|
|
|
|
private:
|
|
void* m_devMode;
|
|
void* m_devNames;
|
|
|
|
short m_customWindowsPaperId;
|
|
|
|
private:
|
|
wxDECLARE_DYNAMIC_CLASS(wxWindowsPrintNativeData);
|
|
};
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// wxWindowsPrintDialog: the MSW dialog for printing
|
|
// ---------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxWindowsPrintDialog : public wxPrintDialogBase
|
|
{
|
|
public:
|
|
wxWindowsPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL);
|
|
wxWindowsPrintDialog(wxWindow *parent, wxPrintData* data);
|
|
virtual ~wxWindowsPrintDialog();
|
|
|
|
bool Create(wxWindow *parent, wxPrintDialogData* data = NULL);
|
|
virtual int ShowModal();
|
|
|
|
wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; }
|
|
wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); }
|
|
|
|
virtual wxDC *GetPrintDC();
|
|
|
|
private:
|
|
wxPrintDialogData m_printDialogData;
|
|
wxPrinterDC* m_printerDC;
|
|
bool m_destroyDC;
|
|
wxWindow* m_dialogParent;
|
|
|
|
private:
|
|
bool ConvertToNative( wxPrintDialogData &data );
|
|
bool ConvertFromNative( wxPrintDialogData &data );
|
|
|
|
// holds MSW handle
|
|
void* m_printDlg;
|
|
|
|
private:
|
|
wxDECLARE_CLASS(wxWindowsPrintDialog);
|
|
wxDECLARE_NO_COPY_CLASS(wxWindowsPrintDialog);
|
|
};
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// wxWindowsPageSetupDialog: the MSW page setup dialog
|
|
// ---------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxWindowsPageSetupDialog: public wxPageSetupDialogBase
|
|
{
|
|
public:
|
|
wxWindowsPageSetupDialog();
|
|
wxWindowsPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL);
|
|
virtual ~wxWindowsPageSetupDialog();
|
|
|
|
bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL);
|
|
virtual int ShowModal();
|
|
bool ConvertToNative( wxPageSetupDialogData &data );
|
|
bool ConvertFromNative( wxPageSetupDialogData &data );
|
|
|
|
virtual wxPageSetupDialogData& GetPageSetupDialogData() { return m_pageSetupData; }
|
|
|
|
private:
|
|
wxPageSetupDialogData m_pageSetupData;
|
|
wxWindow* m_dialogParent;
|
|
|
|
// holds MSW handle
|
|
void* m_pageDlg;
|
|
|
|
private:
|
|
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowsPageSetupDialog);
|
|
};
|
|
|
|
#endif // wxUSE_PRINTING_ARCHITECTURE
|
|
|
|
#endif
|
|
// _WX_PRINTDLG_H_
|