X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab6b6b15e0790bf3fd9e5b58da7077ac5592d8d3..660296aa90ad5ecc98c585cc24567cee8130499a:/include/wx/x11/window.h diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h index feace83629..b4642112b5 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_ -#ifdef __GNUG__ +#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 ); @@ -84,9 +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); + #if wxUSE_DRAG_AND_DROP virtual void SetDropTarget( wxDropTarget *dropTarget ); #endif // wxUSE_DRAG_AND_DROP @@ -107,8 +106,8 @@ public: virtual WXWindow GetMainWindow() const; // Get X11 window representing the client area - virtual WXWindow GetClientWindow() const; - + virtual WXWindow GetClientAreaWindow() const; + void SetLastClick(int button, long timestamp) { m_lastButton = button; m_lastTS = timestamp; } @@ -146,18 +145,11 @@ 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 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);