X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/992b2ec476a34e6f71220ad103b45b107f20f370..d4cace1ccdeb961a0c85d808541b8b941e71bfbf:/include/wx/window.h?ds=sidebyside diff --git a/include/wx/window.h b/include/wx/window.h index 7a20ca1615..f641fc3dca 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -368,7 +368,7 @@ public: { DoSetSizeHints(minW, minH, maxW, maxH, incW, incH); } - + void SetSizeHints( const wxSize& minSize, const wxSize& maxSize=wxDefaultSize, const wxSize& incSize=wxDefaultSize) @@ -377,7 +377,7 @@ public: maxSize.x, maxSize.y, incSize.x, incSize.y); } - + virtual void DoSetSizeHints(int minW, int minH, int maxW = wxDefaultCoord, int maxH = wxDefaultCoord, int incW = wxDefaultCoord, int incH = wxDefaultCoord ); @@ -502,7 +502,7 @@ public: // return the window which currently has the focus or NULL static wxWindow *FindFocus(); - + static wxWindow *DoFindFocus() /* = 0: implement in derived classes */; // can this window have focus? @@ -1085,7 +1085,7 @@ protected: // returns the main window of composite control; this is the window // that FindFocus returns if the focus is in one of composite control's // windows - virtual wxWindow *GetMainWindowOfCompositeControl() + virtual wxWindow *GetMainWindowOfCompositeControl() { return (wxWindow*)this; } // the window id - a number which uniquely identifies a window among @@ -1412,7 +1412,7 @@ class WXDLLEXPORT wxWindowAccessible: public wxAccessible { public: wxWindowAccessible(wxWindow* win): wxAccessible(win) { if (win) win->SetAccessible(this); } - virtual ~wxWindowAccessible() {}; + virtual ~wxWindowAccessible() {} // Overridables