added fix for MSL under Win32 (by Steve Hartwell)

[wxWidgets.git] / include / wx / motif / window.h

diff --git a/include/wx/motif/window.h b/include/wx/motif/window.h
index 84d7303a64899cea83d02a3dccb8c15306572a76..c85264e4f39185ccda0581a911efbc775bb168e4 100644 (file)
--- a/include/wx/motif/window.h
+++ b/include/wx/motif/window.h
@@ -12,7 +12,7 @@
 #ifndef _WX_WINDOW_H_
 #define _WX_WINDOW_H_
 
 #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
 
 #pragma interface "window.h"
 #endif
 


@@ -66,7 +66,6 @@ public:
     
     virtual void Refresh( bool eraseBackground = TRUE,
         const wxRect *rect = (const wxRect *) NULL );
     
     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 );
     
     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
     virtual WXWidget GetTopWidget() const;
     
     // Get the underlying X window and display

+    WXWindow GetClientXWindow() const;

     WXWindow GetXWindow() const;
     WXDisplay *GetXDisplay() 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;
     // For implementation purposes - sometimes decorations make the client area
     // smaller
     virtual wxPoint GetClientAreaOrigin() const;

+
+    // Process idle (send update events)
+    void OnInternalIdle();

     
 protected:
     
 protected:

-    // event handlers (not virtual by design)
-    void OnIdle(wxIdleEvent& event);
-    

     // Responds to colour changes: passes event on to children.
     void OnSysColourChanged(wxSysColourChangedEvent& event);
     
     // Responds to colour changes: passes event on to children.
     void OnSysColourChanged(wxSysColourChangedEvent& event);