Made wxClientDC's use safe as per wxMSW.

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

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 84de58e5ff46da2ae0188576d00bc9d75a21beb2..167d3bc338ca2beb3b24dd96782820a08f53bb00 100644 (file)
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -86,9 +86,6 @@ public:
                                const wxFont *theFont = (const wxFont *) NULL)
                                const;
 
-    virtual void ClientToScreen( int *x, int *y ) const;
-    virtual void ScreenToClient( int *x, int *y ) const;
-
     virtual bool PopupMenu( wxMenu *menu, int x, int y );
 
     virtual void SetScrollbar( int orient, int pos, int thumbVisible,
@@ -109,9 +106,6 @@ public:
 
     virtual WXWidget GetHandle() const { return m_widget; }
 
-    // wxWindows callbacks
-    void OnKeyDown( wxKeyEvent &event );
-
     // also sets the global flag
     void SetScrolling(bool scroll);
 
@@ -148,10 +142,10 @@ public:
     // creates a new widget style if none is there
     // and sets m_widgetStyle to this value.
     GtkStyle *GetWidgetStyle();
-    
+
     // called by SetFont() and SetXXXColour etc
     void SetWidgetStyle();
-    
+
     // overridden in many GTK widgets
     virtual void ApplyWidgetStyle();
 
@@ -193,7 +187,7 @@ public:
     bool                 m_isStaticBox:1;   /* faster than IS_KIND_OF */
     bool                 m_isFrame:1;       /* faster than IS_KIND_OF */
     bool                 m_acceptsFocus:1;  /* ! wxStaticBox etc.  */
-    
+
     // these are true if the style were set before the widget was realized
     // (typcally in the constructor) but the actual GTK style must not be set
     // before the widget has been "realized"
@@ -214,6 +208,8 @@ public:
     wxInsertChildFunction  m_insertCallback;
 
     // implement the base class pure virtuals
+    virtual void DoClientToScreen( int *x, int *y ) const;
+    virtual void DoScreenToClient( int *x, int *y ) const;
     virtual void DoGetPosition( int *x, int *y ) const;
     virtual void DoGetSize( int *width, int *height ) const;
     virtual void DoGetClientSize( int *width, int *height ) const;
@@ -230,7 +226,7 @@ public:
     void Init();
 
 private:
-    DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxWindow);
 };
 
 #endif // __GTKWINDOWH__