X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/148b44a1e7d050307bba3f10fd4520aa514e196f..c8e1af672f46e93ae2fe6d7f9d5b35a3d8d49c16:/include/wx/motif/window.h diff --git a/include/wx/motif/window.h b/include/wx/motif/window.h index 84d7303a64..72cddee687 100644 --- a/include/wx/motif/window.h +++ b/include/wx/motif/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 @@ -66,7 +66,6 @@ public: virtual void Refresh( bool eraseBackground = TRUE, const wxRect *rect = (const wxRect *) NULL ); - virtual void Clear(); virtual bool SetBackgroundColour( const wxColour &colour ); virtual bool SetForegroundColour( const wxColour &colour ); @@ -122,6 +121,7 @@ public: virtual WXWidget GetTopWidget() const; // Get the underlying X window and display + WXWindow GetClientXWindow() const; WXWindow GetXWindow() const; WXDisplay *GetXDisplay() const; @@ -151,11 +151,11 @@ public: // For implementation purposes - sometimes decorations make the client area // smaller virtual wxPoint GetClientAreaOrigin() const; + + // Process idle (send update events) + void OnInternalIdle(); protected: - // event handlers (not virtual by design) - void OnIdle(wxIdleEvent& event); - // Responds to colour changes: passes event on to children. void OnSysColourChanged(wxSysColourChangedEvent& event); @@ -211,11 +211,11 @@ protected: bool DetachWidget(WXWidget widget); // How to implement accelerators. If we find a key event, translate to - // wxWindows wxKeyEvent form. Find a widget for the window. Now find a + // wxWidgets wxKeyEvent form. Find a widget for the window. Now find a // wxWindow for the widget. If there isn't one, go up the widget hierarchy // trying to find one. Once one is found, call ProcessAccelerator for the // window. If it returns TRUE (processed the event), skip the X event, - // otherwise carry on up the wxWindows window hierarchy calling + // otherwise carry on up the wxWidgets window hierarchy calling // ProcessAccelerator. If all return FALSE, process the X event as normal. // Eventually we can implement OnCharHook the same way, but concentrate on // accelerators for now. ProcessAccelerator must look at the current