1. changed spelling error in wxTR_HAS_VARIABLE_HEIGHT (missing 'E')

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

diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h
index 0d38f748bd0e2fe45e149bdef2136e4a7648e49a..fbbc2b18c12c42d5f7ea4cef491e55cef0189472 100644 (file)
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/window.h
@@ -86,10 +86,7 @@ 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 bool DoPopupMenu( wxMenu *menu, int x, int y );

 
     virtual void SetScrollbar( int orient, int pos, int thumbVisible,
                                int range, bool refresh = TRUE );
 
     virtual void SetScrollbar( int orient, int pos, int thumbVisible,
                                int range, bool refresh = TRUE );


@@ -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);


@@ -129,8 +125,10 @@ public:
             const wxSize &size, long style, const wxString &name );
     void PostCreation();
 
             const wxSize &size, long style, const wxString &name );
     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
 
     /* the methods below are required because many native widgets
        are composed of several subwidgets and setting a style for


@@ -143,32 +141,42 @@ public:
     virtual bool IsOwnGtkWindow( GdkWindow *window );
     void ConnectWidget( GtkWidget *widget );
 
     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. */

     GtkStyle *GetWidgetStyle();
     GtkStyle *GetWidgetStyle();

+
+    /* called by SetFont() and SetXXXColour etc */

     void SetWidgetStyle();
     void SetWidgetStyle();

+
+    /* overridden in many GTK widgets */

     virtual void ApplyWidgetStyle();
 
 #if wxUSE_TOOLTIPS
     virtual void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
 #endif // wxUSE_TOOLTIPS
 
     virtual void ApplyWidgetStyle();
 
 #if wxUSE_TOOLTIPS
     virtual void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
 #endif // wxUSE_TOOLTIPS
 

-    // called from GTK signales handlers
+    // called from GTK signales handlers. it indicates that
+    // the layouting functions have to be called later on
+    // (i.e. in idle time, implemented in OnInternalIdle() ).

     void UpdateSize() { m_sizeSet = FALSE; }
     void UpdateSize() { m_sizeSet = FALSE; }

-    void InternalSetPosition(int x, int y) { m_x = x; m_y = y; }
-    void InternalSetSize(int w, int h)
-        { m_width = w; m_height = h; UpdateSize(); }

 
     // position and size of the window
     int                  m_x, m_y;
     int                  m_width, m_height;
 
 
     // position and size of the window
     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;
 
     GtkWidget           *m_widget;
     GtkWidget           *m_wxwindow;
 

-    // scrolling stuff
+    /* scrolling stuff */

     GtkAdjustment       *m_hAdjust,*m_vAdjust;
     GtkAdjustment       *m_hAdjust,*m_vAdjust;

-    float                m_oldHorizontalPos,
-                         m_oldVerticalPos;
+    float                m_oldHorizontalPos;
+    float                m_oldVerticalPos;
+
+    // we need an extra XGC flag set to get exposed
+    // events from overlapping children upon moving
+    // them. this flag will be set in this GC and
+    // the GC will be used in wxWindow::ScrollWindow().

     GdkGC               *m_scrollGC;
 
     // extra (wxGTK-specific) flags
     GdkGC               *m_scrollGC;
 
     // extra (wxGTK-specific) flags


@@ -179,14 +187,37 @@ public:
     bool                 m_sizeSet:1;
     bool                 m_resizing:1;
     bool                 m_isStaticBox:1;   /* faster than IS_KIND_OF */
     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.  */
 
     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"
+    bool                 m_delayedFont:1;
+    bool                 m_delayedForegroundColour:1;
+    bool                 m_delayedBackgroundColour:1;
+    bool                 m_delayedCursor:1;
+    
+    // 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;
 
     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.

     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;


@@ -203,7 +234,7 @@ public:
     void Init();
 
 private:
     void Init();
 
 private:

-    DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxWindow);

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