X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..b8af111fa5d3916e6f42fee3af0ab1bec0ace7b6:/include/wx/x11/window.h diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h index 057961575f..b665e97d2d 100644 --- a/include/wx/x11/window.h +++ b/include/wx/x11/window.h @@ -12,17 +12,13 @@ #ifndef _WX_WINDOW_H_ #define _WX_WINDOW_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "window.h" -#endif - #include "wx/region.h" // ---------------------------------------------------------------------------- // wxWindow class for Motif - see also wxWindowBase // ---------------------------------------------------------------------------- -class wxWindowX11 : public wxWindowBase +class WXDLLIMPEXP_CORE wxWindowX11 : public wxWindowBase { friend class WXDLLEXPORT wxDC; friend class WXDLLEXPORT wxWindowDC; @@ -82,13 +78,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 +141,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