X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edf6a063410b3fa401c913153a64f81d700fbda4..fb8a56b77ce195d0bd9ac6984e3e5cbb7136faca:/include/wx/x11/window.h diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h index 16ca8b298e..057961575f 100644 --- a/include/wx/x11/window.h +++ b/include/wx/x11/window.h @@ -12,7 +12,7 @@ #ifndef _WX_WINDOW_H_ #define _WX_WINDOW_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "window.h" #endif @@ -64,8 +64,6 @@ public: const wxRect *rect = (const wxRect *) NULL ); virtual void Update(); - virtual void Clear(); - virtual bool SetBackgroundColour( const wxColour &colour ); virtual bool SetForegroundColour( const wxColour &colour ); @@ -87,6 +85,10 @@ public: virtual void SetSizeHints(int minW, int minH, int maxW = -1, int maxH = -1, int incW = -1, int incH = -1); + void SetSizeHints( const wxSize& minSize, + const wxSize& maxSize=wxDefaultSize, + const wxSize& incSize=wxDefaultSize) + { wxWindowBase::SetSizeHints(minSize, maxSize, incSize); } #if wxUSE_DRAG_AND_DROP virtual void SetDropTarget( wxDropTarget *dropTarget ); #endif // wxUSE_DRAG_AND_DROP @@ -155,9 +157,6 @@ public: // OnInternalIdle virtual void OnInternalIdle(); - // For compatibility across platforms (not in event table) - void OnIdle(wxIdleEvent& WXUNUSED(event)) {} - protected: // Responds to colour changes: passes event on to children. void OnSysColourChanged(wxSysColourChangedEvent& event);