X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..478cde3220641d49cfbd492e799107d13ccdfeb3:/include/wx/x11/window.h?ds=inline diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h index 9e7c63727f..b4642112b5 100644 --- a/include/wx/x11/window.h +++ b/include/wx/x11/window.h @@ -6,7 +6,7 @@ // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_WINDOW_H_ @@ -82,13 +82,10 @@ public: virtual void ScrollWindow( int dx, int dy, const wxRect* rect = (wxRect *) NULL ); - virtual void SetSizeHints(int minW, int minH, + virtual void DoSetSizeHints(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 @@ -148,10 +145,6 @@ public: static void DoChangeForegroundColour(WXWindow widget, wxColour& foregroundColour); static void DoChangeBackgroundColour(WXWindow widget, wxColour& backgroundColour, bool changeArmColour = FALSE); - // For implementation purposes - sometimes decorations make the client area - // smaller - virtual wxPoint GetClientAreaOrigin() const; - // I don't want users to override what's done in idle so everything that // has to be done in idle time in order for wxX11 to work is done in // OnInternalIdle