mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-17 19:49:12 +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.
141 lines
4.6 KiB
C++
141 lines
4.6 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/osx/notebook.h
|
|
// Purpose: MSW/GTK compatible notebook (a.k.a. property sheet)
|
|
// Author: Stefan Csomor
|
|
// Modified by:
|
|
// Copyright: (c) Stefan Csomor
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_NOTEBOOK_H_
|
|
#define _WX_NOTEBOOK_H_
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// headers
|
|
// ----------------------------------------------------------------------------
|
|
#include "wx/event.h"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// types
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// fwd declarations
|
|
class WXDLLIMPEXP_FWD_CORE wxImageList;
|
|
class WXDLLIMPEXP_FWD_CORE wxWindow;
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxNotebook
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase
|
|
{
|
|
public:
|
|
// ctors
|
|
// -----
|
|
// default for dynamic class
|
|
wxNotebook() { }
|
|
// the same arguments as for wxControl (@@@ any special styles?)
|
|
wxNotebook(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = 0,
|
|
const wxString& name = wxNotebookNameStr)
|
|
{ Create( parent, id, pos, size, style, name ); }
|
|
// Create() function
|
|
bool Create(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = 0,
|
|
const wxString& name = wxNotebookNameStr);
|
|
// dtor
|
|
virtual ~wxNotebook();
|
|
|
|
// accessors
|
|
// ---------
|
|
// set the currently selected page, return the index of the previously
|
|
// selected one (or wxNOT_FOUND on error)
|
|
// NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
|
|
int SetSelection(size_t nPage) wxOVERRIDE { return DoSetSelection(nPage, SetSelection_SendEvent); }
|
|
|
|
// changes selected page without sending events
|
|
int ChangeSelection(size_t nPage) wxOVERRIDE { return DoSetSelection(nPage); }
|
|
|
|
// set/get the title of a page
|
|
bool SetPageText(size_t nPage, const wxString& strText) wxOVERRIDE;
|
|
wxString GetPageText(size_t nPage) const wxOVERRIDE;
|
|
|
|
// sets/returns item's image index in the current image list
|
|
int GetPageImage(size_t nPage) const wxOVERRIDE;
|
|
bool SetPageImage(size_t nPage, int nImage) wxOVERRIDE;
|
|
|
|
// control the appearance of the notebook pages
|
|
// set the size (the same for all pages)
|
|
virtual void SetPageSize(const wxSize& size) wxOVERRIDE;
|
|
// set the padding between tabs (in pixels)
|
|
virtual void SetPadding(const wxSize& padding) wxOVERRIDE;
|
|
// sets the size of the tabs (assumes all tabs are the same size)
|
|
virtual void SetTabSize(const wxSize& sz) wxOVERRIDE;
|
|
|
|
// hit test
|
|
virtual int HitTest(const wxPoint& pt, long *flags = NULL) const wxOVERRIDE;
|
|
|
|
// calculate size for wxNotebookSizer
|
|
wxSize CalcSizeFromPage(const wxSize& sizePage) const wxOVERRIDE;
|
|
wxRect GetPageRect() const wxOVERRIDE;
|
|
|
|
// operations
|
|
// ----------
|
|
// remove all pages
|
|
bool DeleteAllPages() wxOVERRIDE;
|
|
// the same as AddPage(), but adds it at the specified position
|
|
bool InsertPage(size_t nPage,
|
|
wxNotebookPage *pPage,
|
|
const wxString& strText,
|
|
bool bSelect = false,
|
|
int imageId = NO_IMAGE) wxOVERRIDE;
|
|
|
|
// callbacks
|
|
// ---------
|
|
void OnSize(wxSizeEvent& event);
|
|
void OnSetFocus(wxFocusEvent& event);
|
|
void OnNavigationKey(wxNavigationKeyEvent& event);
|
|
|
|
// implementation
|
|
// --------------
|
|
|
|
#if wxUSE_CONSTRAINTS
|
|
virtual void SetConstraintSizes(bool recurse = true) wxOVERRIDE;
|
|
virtual bool DoPhase(int nPhase) wxOVERRIDE;
|
|
|
|
#endif
|
|
|
|
// base class virtuals
|
|
// -------------------
|
|
virtual void Command(wxCommandEvent& event) wxOVERRIDE;
|
|
// osx specific event handling common for all osx-ports
|
|
|
|
virtual bool OSXHandleClicked( double timestampsec ) wxOVERRIDE;
|
|
|
|
protected:
|
|
virtual wxNotebookPage *DoRemovePage(size_t page) wxOVERRIDE;
|
|
// common part of all ctors
|
|
void Init();
|
|
|
|
// helper functions
|
|
void ChangePage(int nOldSel, int nSel); // change pages
|
|
void MacSetupTabs();
|
|
|
|
int DoSetSelection(size_t nPage, int flags = 0) wxOVERRIDE;
|
|
|
|
// the icon indices
|
|
wxArrayInt m_images;
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxNotebook);
|
|
wxDECLARE_EVENT_TABLE();
|
|
};
|
|
|
|
|
|
#endif // _WX_NOTEBOOK_H_
|