Misc small changes

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

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index b43b7e8c1c4132fbd554c1f63a339b9412057c2f..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;
 
                                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,
     virtual bool PopupMenu( wxMenu *menu, int x, int y );
 
     virtual void SetScrollbar( int orient, int pos, int thumbVisible,


@@ -107,8 +104,7 @@ public:
     // implementation
     // --------------
 
     // implementation
     // --------------
 

-    // wxWindows callbacks
-    void OnKeyDown( wxKeyEvent &event );
+    virtual WXWidget GetHandle() const { return m_widget; }

 
     // also sets the global flag
     void SetScrolling(bool scroll);
 
     // also sets the global flag
     void SetScrolling(bool scroll);


@@ -146,10 +142,10 @@ public:
     // creates a new widget style if none is there
     // and sets m_widgetStyle to this value.
     GtkStyle *GetWidgetStyle();
     // 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();
     // called by SetFont() and SetXXXColour etc
     void SetWidgetStyle();

-    
+

     // overridden in many GTK widgets
     virtual void ApplyWidgetStyle();
 
     // overridden in many GTK widgets
     virtual void ApplyWidgetStyle();
 


@@ -191,31 +187,29 @@ 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.  */
     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"
+
+    // 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"

     bool                 m_delayedFont:1;
     bool                 m_delayedForegroundColour:1;
     bool                 m_delayedBackgroundColour:1;
     bool                 m_delayedCursor:1;
 
     bool                 m_delayedFont:1;
     bool                 m_delayedForegroundColour:1;
     bool                 m_delayedBackgroundColour:1;
     bool                 m_delayedCursor:1;
 

-    // contains GTK's widgets internal information
-    // about non-default widget font and colours.
-    // we create one for each widget that gets any
-    // non-default attribute set via SetFont() or
-    // SetForegroundColour() / SetBackgroundColour().
+    // contains GTK's widgets internal information about non-default widget
+    // font and colours. we create one for each widget that gets any
+    // non-default attribute set via SetFont() or SetForegroundColour() /
+    // SetBackgroundColour().

     GtkStyle            *m_widgetStyle;
 
     GtkStyle            *m_widgetStyle;
 

-    // C++ has no virtual methods in the constrcutor
-    // of any class but we need different methods
-    // of inserting a child window into a wxFrame,
-    // wxMDIFrame, wxNotebook etc. this is the
-    // callback that will get used.
+    // C++ has no virtual methods in the constrcutor of any class but we need
+    // different methods of inserting a child window into a wxFrame,
+    // wxMDIFrame, wxNotebook etc. this is the callback that will get used.

     wxInsertChildFunction  m_insertCallback;
 
     // implement the base class pure virtuals
     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;
     virtual void DoGetPosition( int *x, int *y ) const;
     virtual void DoGetSize( int *width, int *height ) const;
     virtual void DoGetClientSize( int *width, int *height ) const;


@@ -232,7 +226,7 @@ public:
     void Init();
 
 private:
     void Init();
 
 private:

-    DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxWindow);

 };
 
 #endif // __GTKWINDOWH__
 };
 
 #endif // __GTKWINDOWH__