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
1 parent
3a26167148
commit
822326eea9
1748 files changed
+58817
-84428
No files matched your search
+41
-38
@@ -63,10 +63,10 @@ public:
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString &name = wxListCtrlNameStr);
|
||||
|
||||
bool GetColumn( int col, wxListItem& item ) const;
|
||||
bool SetColumn( int col, const wxListItem& item );
|
||||
int GetColumnWidth( int col ) const;
|
||||
bool SetColumnWidth( int col, int width);
|
||||
bool GetColumn( int col, wxListItem& item ) const wxOVERRIDE;
|
||||
bool SetColumn( int col, const wxListItem& item ) wxOVERRIDE;
|
||||
int GetColumnWidth( int col ) const wxOVERRIDE;
|
||||
bool SetColumnWidth( int col, int width) wxOVERRIDE;
|
||||
int GetCountPerPage() const; // not the same in wxGLC as in Windows, I think
|
||||
wxRect GetViewRect() const;
|
||||
|
||||
@@ -87,7 +87,7 @@ public:
|
||||
bool GetItemPosition( long item, wxPoint& pos ) const;
|
||||
bool SetItemPosition( long item, const wxPoint& pos ); // not supported in wxGLC
|
||||
int GetItemCount() const;
|
||||
int GetColumnCount() const;
|
||||
int GetColumnCount() const wxOVERRIDE;
|
||||
void SetItemSpacing( int spacing, bool isSmall = false );
|
||||
wxSize GetItemSpacing() const;
|
||||
void SetItemTextColour( long item, const wxColour& col);
|
||||
@@ -101,25 +101,34 @@ public:
|
||||
void SetTextColour(const wxColour& col);
|
||||
long GetTopItem() const;
|
||||
|
||||
virtual bool HasCheckboxes() const wxOVERRIDE;
|
||||
virtual bool EnableCheckboxes(bool enable = true) wxOVERRIDE;
|
||||
virtual bool IsItemChecked(long item) const wxOVERRIDE;
|
||||
virtual void CheckItem(long item, bool check) wxOVERRIDE;
|
||||
|
||||
void SetSingleStyle( long style, bool add = true ) ;
|
||||
void SetWindowStyleFlag( long style );
|
||||
void SetWindowStyleFlag( long style ) wxOVERRIDE;
|
||||
void RecreateWindow() {}
|
||||
long GetNextItem( long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE ) const;
|
||||
wxImageList *GetImageList( int which ) const;
|
||||
void SetImageList( wxImageList *imageList, int which );
|
||||
void AssignImageList( wxImageList *imageList, int which );
|
||||
wxImageList *GetImageList( int which ) const wxOVERRIDE;
|
||||
void SetImageList( wxImageList *imageList, int which ) wxOVERRIDE;
|
||||
void AssignImageList( wxImageList *imageList, int which ) wxOVERRIDE;
|
||||
bool Arrange( int flag = wxLIST_ALIGN_DEFAULT ); // always wxLIST_ALIGN_LEFT in wxGLC
|
||||
|
||||
void ClearAll();
|
||||
bool DeleteItem( long item );
|
||||
bool DeleteAllItems();
|
||||
bool DeleteAllColumns();
|
||||
bool DeleteColumn( int col );
|
||||
bool DeleteAllColumns() wxOVERRIDE;
|
||||
bool DeleteColumn( int col ) wxOVERRIDE;
|
||||
|
||||
void SetItemCount(long count);
|
||||
|
||||
wxTextCtrl *EditLabel(long item,
|
||||
wxClassInfo* textControlClass = wxCLASSINFO(wxTextCtrl));
|
||||
|
||||
// End label editing, optionally cancelling the edit
|
||||
bool EndEditLabel(bool cancel);
|
||||
|
||||
wxTextCtrl* GetEditControl() const;
|
||||
void Edit( long item ) { EditLabel(item); }
|
||||
|
||||
@@ -143,18 +152,12 @@ public:
|
||||
void RefreshItem(long item);
|
||||
void RefreshItems(long itemFrom, long itemTo);
|
||||
|
||||
virtual void EnableBellOnNoMatch(bool on = true);
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_6
|
||||
// obsolete, don't use
|
||||
wxDEPRECATED( int GetItemSpacing( bool isSmall ) const );
|
||||
#endif // WXWIN_COMPATIBILITY_2_6
|
||||
|
||||
virtual void EnableBellOnNoMatch(bool on = true) wxOVERRIDE;
|
||||
|
||||
// overridden base class virtuals
|
||||
// ------------------------------
|
||||
|
||||
virtual wxVisualAttributes GetDefaultAttributes() const
|
||||
virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE
|
||||
{
|
||||
return GetClassDefaultAttributes(GetWindowVariant());
|
||||
}
|
||||
@@ -162,7 +165,7 @@ public:
|
||||
static wxVisualAttributes
|
||||
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
|
||||
|
||||
virtual void Update();
|
||||
virtual void Update() wxOVERRIDE;
|
||||
|
||||
|
||||
// implementation only from now on
|
||||
@@ -171,25 +174,25 @@ public:
|
||||
// generic version extension, don't use in portable code
|
||||
bool Update( long item );
|
||||
|
||||
void OnInternalIdle( );
|
||||
void OnInternalIdle( ) wxOVERRIDE;
|
||||
|
||||
// We have to hand down a few functions
|
||||
virtual void Refresh(bool eraseBackground = true,
|
||||
const wxRect *rect = NULL);
|
||||
const wxRect *rect = NULL) wxOVERRIDE;
|
||||
|
||||
virtual bool SetBackgroundColour( const wxColour &colour );
|
||||
virtual bool SetForegroundColour( const wxColour &colour );
|
||||
virtual bool SetBackgroundColour( const wxColour &colour ) wxOVERRIDE;
|
||||
virtual bool SetForegroundColour( const wxColour &colour ) wxOVERRIDE;
|
||||
virtual wxColour GetBackgroundColour() const;
|
||||
virtual wxColour GetForegroundColour() const;
|
||||
virtual bool SetFont( const wxFont &font );
|
||||
virtual bool SetCursor( const wxCursor &cursor );
|
||||
virtual bool SetFont( const wxFont &font ) wxOVERRIDE;
|
||||
virtual bool SetCursor( const wxCursor &cursor ) wxOVERRIDE;
|
||||
|
||||
#if wxUSE_DRAG_AND_DROP
|
||||
virtual void SetDropTarget( wxDropTarget *dropTarget );
|
||||
virtual wxDropTarget *GetDropTarget() const;
|
||||
virtual void SetDropTarget( wxDropTarget *dropTarget ) wxOVERRIDE;
|
||||
virtual wxDropTarget *GetDropTarget() const wxOVERRIDE;
|
||||
#endif
|
||||
|
||||
virtual bool ShouldInheritColours() const { return false; }
|
||||
virtual bool ShouldInheritColours() const wxOVERRIDE { return false; }
|
||||
|
||||
// implementation
|
||||
// --------------
|
||||
@@ -205,12 +208,12 @@ public:
|
||||
|
||||
protected:
|
||||
// Implement base class pure virtual methods.
|
||||
long DoInsertColumn(long col, const wxListItem& info);
|
||||
long DoInsertColumn(long col, const wxListItem& info) wxOVERRIDE;
|
||||
|
||||
|
||||
virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
|
||||
virtual bool DoPopupMenu( wxMenu *menu, int x, int y ) wxOVERRIDE;
|
||||
|
||||
virtual wxSize DoGetBestClientSize() const;
|
||||
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
|
||||
|
||||
// return the text for the given column of the given item
|
||||
virtual wxString OnGetItemText(long item, long column) const;
|
||||
@@ -226,9 +229,9 @@ protected:
|
||||
// it calls our OnGetXXX() functions
|
||||
friend class WXDLLIMPEXP_FWD_CORE wxListMainWindow;
|
||||
|
||||
virtual wxBorder GetDefaultBorder() const;
|
||||
virtual wxBorder GetDefaultBorder() const wxOVERRIDE;
|
||||
|
||||
virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size);
|
||||
virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size) wxOVERRIDE;
|
||||
|
||||
private:
|
||||
void CreateOrDestroyHeaderWindowAsNeeded();
|
||||
@@ -237,15 +240,15 @@ private:
|
||||
|
||||
// we need to return a special WM_GETDLGCODE value to process just the
|
||||
// arrows but let the other navigation characters through
|
||||
#if defined(__WXMSW__) && !defined(__WXWINCE__) && !defined(__WXUNIVERSAL__)
|
||||
#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
|
||||
virtual WXLRESULT
|
||||
MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
|
||||
#endif // __WXMSW__
|
||||
|
||||
WX_FORWARD_TO_SCROLL_HELPER()
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
DECLARE_DYNAMIC_CLASS(wxGenericListCtrl)
|
||||
wxDECLARE_EVENT_TABLE();
|
||||
wxDECLARE_DYNAMIC_CLASS(wxGenericListCtrl);
|
||||
};
|
||||
|
||||
#if (!defined(__WXMSW__) || defined(__WXUNIVERSAL__)) && (!(defined(__WXMAC__) && wxOSX_USE_CARBON) || defined(__WXUNIVERSAL__ ))
|
||||
@@ -256,7 +259,7 @@ private:
|
||||
|
||||
class WXDLLIMPEXP_CORE wxListCtrl: public wxGenericListCtrl
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxListCtrl)
|
||||
wxDECLARE_DYNAMIC_CLASS(wxListCtrl);
|
||||
|
||||
public:
|
||||
wxListCtrl() {}
|
||||
|
||||
Reference in new issue
Block a user