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
+9
-9
@@ -49,11 +49,11 @@ public:
|
||||
const wxString& name = wxDatePickerCtrlNameStr);
|
||||
|
||||
// wxDatePickerCtrl methods
|
||||
void SetValue(const wxDateTime& date);
|
||||
wxDateTime GetValue() const;
|
||||
void SetValue(const wxDateTime& date) wxOVERRIDE;
|
||||
wxDateTime GetValue() const wxOVERRIDE;
|
||||
|
||||
bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const;
|
||||
void SetRange(const wxDateTime &dt1, const wxDateTime &dt2);
|
||||
bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const wxOVERRIDE;
|
||||
void SetRange(const wxDateTime &dt1, const wxDateTime &dt2) wxOVERRIDE;
|
||||
|
||||
bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime,
|
||||
const wxDateTime& upperdate = wxDefaultDateTime);
|
||||
@@ -66,29 +66,29 @@ public:
|
||||
// -------------------------------
|
||||
|
||||
// overridden base class methods
|
||||
virtual bool Destroy();
|
||||
virtual bool Destroy() wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
|
||||
private:
|
||||
void Init();
|
||||
|
||||
// return the list of the windows composing this one
|
||||
virtual wxWindowList GetCompositeWindowParts() const;
|
||||
virtual wxWindowList GetCompositeWindowParts() const wxOVERRIDE;
|
||||
|
||||
void OnText(wxCommandEvent &event);
|
||||
void OnSize(wxSizeEvent& event);
|
||||
void OnFocus(wxFocusEvent& event);
|
||||
|
||||
#ifdef __WXOSX_COCOA__
|
||||
virtual void OSXGenerateEvent(const wxDateTime& WXUNUSED(dt)) { }
|
||||
virtual void OSXGenerateEvent(const wxDateTime& WXUNUSED(dt)) wxOVERRIDE { }
|
||||
#endif
|
||||
|
||||
wxComboCtrl* m_combo;
|
||||
wxCalendarComboPopup* m_popup;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
wxDECLARE_EVENT_TABLE();
|
||||
wxDECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric);
|
||||
};
|
||||
|
||||
|
||||
Reference in new issue
Block a user