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.
163 lines
4.7 KiB
C++
163 lines
4.7 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/generic/propdlg.h
|
|
// Purpose: wxPropertySheetDialog
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 2005-03-12
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_PROPDLG_H_
|
|
#define _WX_PROPDLG_H_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_BOOKCTRL
|
|
|
|
#include "wx/dialog.h"
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxBookCtrlBase;
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxPropertySheetDialog
|
|
// A platform-independent properties dialog with a notebook and standard
|
|
// buttons.
|
|
//
|
|
// To use this class, call Create from your derived class.
|
|
// Then create pages and add to the book control. Finally call CreateButtons and
|
|
// LayoutDialog.
|
|
//
|
|
// For example:
|
|
//
|
|
// MyPropertySheetDialog::Create(...)
|
|
// {
|
|
// wxPropertySheetDialog::Create(...);
|
|
//
|
|
// // Add page
|
|
// wxPanel* panel = new wxPanel(GetBookCtrl(), ...);
|
|
// GetBookCtrl()->AddPage(panel, wxT("General"));
|
|
//
|
|
// CreateButtons();
|
|
// LayoutDialog();
|
|
// }
|
|
//
|
|
// Override CreateBookCtrl and AddBookCtrl to create and add a different
|
|
// kind of book control.
|
|
//-----------------------------------------------------------------------------
|
|
|
|
enum wxPropertySheetDialogFlags
|
|
{
|
|
// Use the platform default
|
|
wxPROPSHEET_DEFAULT = 0x0001,
|
|
|
|
// Use a notebook
|
|
wxPROPSHEET_NOTEBOOK = 0x0002,
|
|
|
|
// Use a toolbook
|
|
wxPROPSHEET_TOOLBOOK = 0x0004,
|
|
|
|
// Use a choicebook
|
|
wxPROPSHEET_CHOICEBOOK = 0x0008,
|
|
|
|
// Use a listbook
|
|
wxPROPSHEET_LISTBOOK = 0x0010,
|
|
|
|
// Use a wxButtonToolBar toolbook
|
|
wxPROPSHEET_BUTTONTOOLBOOK = 0x0020,
|
|
|
|
// Use a treebook
|
|
wxPROPSHEET_TREEBOOK = 0x0040,
|
|
|
|
// Shrink dialog to fit current page
|
|
wxPROPSHEET_SHRINKTOFIT = 0x0100
|
|
};
|
|
|
|
class WXDLLIMPEXP_ADV wxPropertySheetDialog : public wxDialog
|
|
{
|
|
public:
|
|
wxPropertySheetDialog() : wxDialog() { Init(); }
|
|
|
|
wxPropertySheetDialog(wxWindow* parent, wxWindowID id,
|
|
const wxString& title,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& sz = wxDefaultSize,
|
|
long style = wxDEFAULT_DIALOG_STYLE,
|
|
const wxString& name = wxDialogNameStr)
|
|
{
|
|
Init();
|
|
Create(parent, id, title, pos, sz, style, name);
|
|
}
|
|
|
|
bool Create(wxWindow* parent, wxWindowID id,
|
|
const wxString& title,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& sz = wxDefaultSize,
|
|
long style = wxDEFAULT_DIALOG_STYLE,
|
|
const wxString& name = wxDialogNameStr);
|
|
|
|
//// Accessors
|
|
|
|
// Set and get the notebook
|
|
void SetBookCtrl(wxBookCtrlBase* book) { m_bookCtrl = book; }
|
|
wxBookCtrlBase* GetBookCtrl() const { return m_bookCtrl; }
|
|
|
|
// Override function in base
|
|
virtual wxWindow* GetContentWindow() const wxOVERRIDE;
|
|
|
|
// Set and get the inner sizer
|
|
void SetInnerSize(wxSizer* sizer) { m_innerSizer = sizer; }
|
|
wxSizer* GetInnerSizer() const { return m_innerSizer ; }
|
|
|
|
// Set and get the book style
|
|
void SetSheetStyle(long sheetStyle) { m_sheetStyle = sheetStyle; }
|
|
long GetSheetStyle() const { return m_sheetStyle ; }
|
|
|
|
// Set and get the border around the whole dialog
|
|
void SetSheetOuterBorder(int border) { m_sheetOuterBorder = border; }
|
|
int GetSheetOuterBorder() const { return m_sheetOuterBorder ; }
|
|
|
|
// Set and get the border around the book control only
|
|
void SetSheetInnerBorder(int border) { m_sheetInnerBorder = border; }
|
|
int GetSheetInnerBorder() const { return m_sheetInnerBorder ; }
|
|
|
|
/// Operations
|
|
|
|
// Creates the buttons
|
|
virtual void CreateButtons(int flags = wxOK|wxCANCEL);
|
|
|
|
// Lay out the dialog, to be called after pages have been created
|
|
virtual void LayoutDialog(int centreFlags = wxBOTH);
|
|
|
|
/// Implementation
|
|
|
|
// Creates the book control. If you want to use a different kind of
|
|
// control, override.
|
|
virtual wxBookCtrlBase* CreateBookCtrl();
|
|
|
|
// Adds the book control to the inner sizer.
|
|
virtual void AddBookCtrl(wxSizer* sizer);
|
|
|
|
// Resize dialog if necessary
|
|
void OnIdle(wxIdleEvent& event);
|
|
|
|
private:
|
|
void Init();
|
|
|
|
protected:
|
|
wxBookCtrlBase* m_bookCtrl;
|
|
wxSizer* m_innerSizer; // sizer for extra space
|
|
long m_sheetStyle;
|
|
int m_sheetOuterBorder;
|
|
int m_sheetInnerBorder;
|
|
int m_selectedPage;
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxPropertySheetDialog);
|
|
wxDECLARE_EVENT_TABLE();
|
|
};
|
|
|
|
#endif // wxUSE_BOOKCTRL
|
|
|
|
#endif // _WX_PROPDLG_H_
|
|
|