many changes; major ones:

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

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index b43b7e8c1c4132fbd554c1f63a339b9412057c2f..cb221b82fbcba33c58fde790b640daf0c46a8bde 100644 (file)
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -62,7 +62,7 @@ public:
     virtual void SetFocus();
     virtual bool AcceptsFocus() const;
 
-    virtual bool Reparent( wxWindow *newParent );
+    virtual bool Reparent( wxWindowBase *newParent );
 
     virtual void WarpPointer(int x, int y);
     virtual void CaptureMouse();
@@ -86,10 +86,7 @@ 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 bool DoPopupMenu( wxMenu *menu, int x, int y );
 
     virtual void SetScrollbar( int orient, int pos, int thumbVisible,
                                int range, bool refresh = TRUE );
@@ -107,8 +104,7 @@ public:
     // implementation
     // --------------
 
-    // wxWindows callbacks
-    void OnKeyDown( wxKeyEvent &event );
+    virtual WXWidget GetHandle() const { return m_widget; }
 
     // also sets the global flag
     void SetScrolling(bool scroll);
@@ -124,13 +120,14 @@ public:
     /* For compatibility across platforms (not in event table) */
     void OnIdle(wxIdleEvent& WXUNUSED(event)) {};
 
-    /* used by all classes in the widget creation process */
-    void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,
-            const wxSize &size, long style, const wxString &name );
+    /* used by all window classes in the widget creation process */
+    bool PreCreation( wxWindow *parent, const wxPoint &pos, const wxSize &size );
     void PostCreation();
 
-    void InsertChild(wxWindow *child) { (*m_insertCallback)(this, child); }
-    void DoAddChild(wxWindow *child) { AddChild(child); InsertChild(child); }
+    /* internal addition of child windows. differs from class
+       to class not by using virtual functions but by using
+       the m_insertCallback */
+    void DoAddChild(wxWindow *child);
 
     /* the methods below are required because many native widgets
        are composed of several subwidgets and setting a style for
@@ -143,14 +140,14 @@ public:
     virtual bool IsOwnGtkWindow( GdkWindow *window );
     void ConnectWidget( GtkWidget *widget );
 
-    // creates a new widget style if none is there
-    // and sets m_widgetStyle to this value.
+    /* creates a new widget style if none is there
+       and sets m_widgetStyle to this value. */
     GtkStyle *GetWidgetStyle();
-    
-    // called by SetFont() and SetXXXColour etc
+
+    /* called by SetFont() and SetXXXColour etc */
     void SetWidgetStyle();
-    
-    // overridden in many GTK widgets
+
+    /* overridden in many GTK widgets */
     virtual void ApplyWidgetStyle();
 
 #if wxUSE_TOOLTIPS
@@ -166,11 +163,11 @@ public:
     int                  m_x, m_y;
     int                  m_width, m_height;
 
-    // see the docs in src/gtk/window.cpp
+    /* see the docs in src/gtk/window.cpp */
     GtkWidget           *m_widget;
     GtkWidget           *m_wxwindow;
 
-    // scrolling stuff
+    /* scrolling stuff */
     GtkAdjustment       *m_hAdjust,*m_vAdjust;
     float                m_oldHorizontalPos;
     float                m_oldVerticalPos;
@@ -189,33 +186,37 @@ public:
     bool                 m_sizeSet:1;
     bool                 m_resizing:1;
     bool                 m_isStaticBox:1;   /* faster than IS_KIND_OF */
+    bool                 m_isRadioButton: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;
-
-    // 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().
+    
+    // the cursor is set in OnInternalIdle(). this fields holds
+    // a reference to the cursor currently set in theGdk window 
+    // so that we don't have to set it more than once
+    wxCursor             m_currentGdkCursor;
+
+    // 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;
 
-    // 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
+    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;
@@ -232,7 +233,7 @@ public:
     void Init();
 
 private:
-    DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxWindow);
 };
 
 #endif // __GTKWINDOWH__