Rationalised OnIdle

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

diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h
index feace83629c6736762616ab635cd0c45b61109f1..ef09a5ff93213691a924096001d926163e7e27b7 100644 (file)
--- a/include/wx/x11/window.h
+++ b/include/wx/x11/window.h
@@ -12,7 +12,7 @@
 #ifndef _WX_WINDOW_H_
 #define _WX_WINDOW_H_
 
 #ifndef _WX_WINDOW_H_
 #define _WX_WINDOW_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "window.h"
 #endif
 
 #pragma interface "window.h"
 #endif
 


@@ -107,8 +107,8 @@ public:
     virtual WXWindow GetMainWindow() const;
     
     // Get X11 window representing the client area
     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; }
     
     void SetLastClick(int button, long timestamp)
         { m_lastButton = button; m_lastTS = timestamp; }
     


@@ -155,9 +155,6 @@ public:
     // OnInternalIdle
     virtual void OnInternalIdle();
     
     // 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);
 protected:
     // Responds to colour changes: passes event on to children.
     void OnSysColourChanged(wxSysColourChangedEvent& event);