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:
EmptyChaos committed 2016-06-26 15:25:29 +10:00
1 parent 3a26167148
commit 822326eea9
1748 files changed
+58817 -84428

No files matched your search

+22 -14
View File
@@ -45,7 +45,9 @@ enum
// Editable labels
wxDIRCTRL_EDIT_LABELS = 0x0100,
// Allow multiple selection
wxDIRCTRL_MULTIPLE = 0x0200
wxDIRCTRL_MULTIPLE = 0x0200,
wxDIRCTRL_DEFAULT_STYLE = wxDIRCTRL_3D_INTERNAL
};
//-----------------------------------------------------------------------------
@@ -78,11 +80,11 @@ class WXDLLIMPEXP_CORE wxGenericDirCtrl: public wxControl
{
public:
wxGenericDirCtrl();
wxGenericDirCtrl(wxWindow *parent, const wxWindowID id = wxID_ANY,
wxGenericDirCtrl(wxWindow *parent, wxWindowID id = wxID_ANY,
const wxString &dir = wxDirDialogDefaultFolderStr,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDIRCTRL_3D_INTERNAL,
long style = wxDIRCTRL_DEFAULT_STYLE,
const wxString& filter = wxEmptyString,
int defaultFilter = 0,
const wxString& name = wxTreeCtrlNameStr )
@@ -91,11 +93,11 @@ public:
Create(parent, id, dir, pos, size, style, filter, defaultFilter, name);
}
bool Create(wxWindow *parent, const wxWindowID id = wxID_ANY,
bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
const wxString &dir = wxDirDialogDefaultFolderStr,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDIRCTRL_3D_INTERNAL,
long style = wxDIRCTRL_DEFAULT_STYLE,
const wxString& filter = wxEmptyString,
int defaultFilter = 0,
const wxString& name = wxTreeCtrlNameStr );
@@ -172,7 +174,7 @@ public:
virtual void CollapseTree();
// overridden base class methods
virtual void SetFocus();
virtual void SetFocus() wxOVERRIDE;
protected:
virtual void ExpandRoot();
@@ -204,8 +206,8 @@ private:
wxDirFilterListCtrl* m_filterListCtrl;
private:
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxGenericDirCtrl)
wxDECLARE_EVENT_TABLE();
wxDECLARE_DYNAMIC_CLASS(wxGenericDirCtrl);
wxDECLARE_NO_COPY_CLASS(wxGenericDirCtrl);
};
@@ -226,7 +228,7 @@ class WXDLLIMPEXP_CORE wxDirFilterListCtrl: public wxChoice
{
public:
wxDirFilterListCtrl() { Init(); }
wxDirFilterListCtrl(wxGenericDirCtrl* parent, const wxWindowID id = wxID_ANY,
wxDirFilterListCtrl(wxGenericDirCtrl* parent, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0)
@@ -235,7 +237,7 @@ public:
Create(parent, id, pos, size, style);
}
bool Create(wxGenericDirCtrl* parent, const wxWindowID id = wxID_ANY,
bool Create(wxGenericDirCtrl* parent, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0);
@@ -253,12 +255,12 @@ public:
protected:
wxGenericDirCtrl* m_dirCtrl;
DECLARE_EVENT_TABLE()
DECLARE_CLASS(wxDirFilterListCtrl)
wxDECLARE_EVENT_TABLE();
wxDECLARE_CLASS(wxDirFilterListCtrl);
wxDECLARE_NO_COPY_CLASS(wxDirFilterListCtrl);
};
#if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXPM__)
#if !defined(__WXMSW__) && !defined(__WXMAC__)
#define wxDirCtrl wxGenericDirCtrl
#endif
@@ -298,11 +300,17 @@ public:
int GetIconID(const wxString& extension, const wxString& mime = wxEmptyString);
wxImageList *GetSmallImageList();
const wxSize& GetSize() const { return m_size; }
void SetSize(const wxSize& sz) { m_size = sz; }
bool IsOk() const { return m_smallImageList != NULL; }
protected:
void Create(); // create on first use
void Create(const wxSize& sz); // create on first use
wxImageList *m_smallImageList;
wxHashTable *m_HashTable;
wxSize m_size;
};
// The global fileicons table