mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-13 01:29: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.
122 lines
3.7 KiB
C++
122 lines
3.7 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/printdlg.h
|
|
// Purpose: Base header and class for print dialogs
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created:
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows Licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_PRINTDLG_H_BASE_
|
|
#define _WX_PRINTDLG_H_BASE_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_PRINTING_ARCHITECTURE
|
|
|
|
#include "wx/event.h"
|
|
#include "wx/dialog.h"
|
|
#include "wx/intl.h"
|
|
#include "wx/cmndata.h"
|
|
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// wxPrintDialogBase: interface for the dialog for printing
|
|
// ---------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxPrintDialogBase : public wxDialog
|
|
{
|
|
public:
|
|
wxPrintDialogBase() { }
|
|
wxPrintDialogBase(wxWindow *parent,
|
|
wxWindowID id = wxID_ANY,
|
|
const wxString &title = wxEmptyString,
|
|
const wxPoint &pos = wxDefaultPosition,
|
|
const wxSize &size = wxDefaultSize,
|
|
long style = wxDEFAULT_DIALOG_STYLE);
|
|
|
|
virtual wxPrintDialogData& GetPrintDialogData() = 0;
|
|
virtual wxPrintData& GetPrintData() = 0;
|
|
virtual wxDC *GetPrintDC() = 0;
|
|
|
|
private:
|
|
wxDECLARE_ABSTRACT_CLASS(wxPrintDialogBase);
|
|
wxDECLARE_NO_COPY_CLASS(wxPrintDialogBase);
|
|
};
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// wxPrintDialog: the dialog for printing.
|
|
// ---------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxPrintDialog : public wxObject
|
|
{
|
|
public:
|
|
wxPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL);
|
|
wxPrintDialog(wxWindow *parent, wxPrintData* data);
|
|
virtual ~wxPrintDialog();
|
|
|
|
virtual int ShowModal();
|
|
|
|
virtual wxPrintDialogData& GetPrintDialogData();
|
|
virtual wxPrintData& GetPrintData();
|
|
virtual wxDC *GetPrintDC();
|
|
|
|
private:
|
|
wxPrintDialogBase *m_pimpl;
|
|
|
|
private:
|
|
wxDECLARE_DYNAMIC_CLASS(wxPrintDialog);
|
|
wxDECLARE_NO_COPY_CLASS(wxPrintDialog);
|
|
};
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// wxPageSetupDialogBase: interface for the page setup dialog
|
|
// ---------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxPageSetupDialogBase: public wxDialog
|
|
{
|
|
public:
|
|
wxPageSetupDialogBase() { }
|
|
wxPageSetupDialogBase(wxWindow *parent,
|
|
wxWindowID id = wxID_ANY,
|
|
const wxString &title = wxEmptyString,
|
|
const wxPoint &pos = wxDefaultPosition,
|
|
const wxSize &size = wxDefaultSize,
|
|
long style = wxDEFAULT_DIALOG_STYLE);
|
|
|
|
virtual wxPageSetupDialogData& GetPageSetupDialogData() = 0;
|
|
|
|
private:
|
|
wxDECLARE_ABSTRACT_CLASS(wxPageSetupDialogBase);
|
|
wxDECLARE_NO_COPY_CLASS(wxPageSetupDialogBase);
|
|
};
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// wxPageSetupDialog: the page setup dialog
|
|
// ---------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxPageSetupDialog: public wxObject
|
|
{
|
|
public:
|
|
wxPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL);
|
|
virtual ~wxPageSetupDialog();
|
|
|
|
int ShowModal();
|
|
wxPageSetupDialogData& GetPageSetupDialogData();
|
|
// old name
|
|
wxPageSetupDialogData& GetPageSetupData();
|
|
|
|
private:
|
|
wxPageSetupDialogBase *m_pimpl;
|
|
|
|
private:
|
|
wxDECLARE_DYNAMIC_CLASS(wxPageSetupDialog);
|
|
wxDECLARE_NO_COPY_CLASS(wxPageSetupDialog);
|
|
};
|
|
|
|
#endif
|
|
|
|
#endif
|
|
// _WX_PRINTDLG_H_BASE_
|