Update wxWidgets to 3.1.0
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.
This commit is contained in:
1 parent
3a26167148
commit
822326eea9
1748 files changed
+58817
-84428
No files matched your search
+8
-8
@@ -48,19 +48,19 @@ public:
|
||||
virtual ~wxHeaderCtrl();
|
||||
|
||||
protected:
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
|
||||
|
||||
private:
|
||||
// implement base class pure virtuals
|
||||
virtual void DoSetCount(unsigned int count);
|
||||
virtual unsigned int DoGetCount() const;
|
||||
virtual void DoUpdate(unsigned int idx);
|
||||
virtual void DoSetCount(unsigned int count) wxOVERRIDE;
|
||||
virtual unsigned int DoGetCount() const wxOVERRIDE;
|
||||
virtual void DoUpdate(unsigned int idx) wxOVERRIDE;
|
||||
|
||||
virtual void DoScrollHorz(int dx);
|
||||
virtual void DoScrollHorz(int dx) wxOVERRIDE;
|
||||
|
||||
virtual void DoSetColumnsOrder(const wxArrayInt& order);
|
||||
virtual wxArrayInt DoGetColumnsOrder() const;
|
||||
virtual void DoSetColumnsOrder(const wxArrayInt& order) wxOVERRIDE;
|
||||
virtual wxArrayInt DoGetColumnsOrder() const wxOVERRIDE;
|
||||
|
||||
// common part of all ctors
|
||||
void Init();
|
||||
@@ -173,7 +173,7 @@ private:
|
||||
wxArrayInt m_colIndices;
|
||||
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
wxDECLARE_EVENT_TABLE();
|
||||
wxDECLARE_NO_COPY_CLASS(wxHeaderCtrl);
|
||||
};
|
||||
|
||||
|
||||
Reference in new issue
Block a user