Updated testconf, fixed mistake in install.

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

diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h
index 84de58e5ff46da2ae0188576d00bc9d75a21beb2..aa722a2f14822dd19052cf8b08b1c53219487def 100644 (file)
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/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,


@@ -109,9 +106,6 @@ public:
 
     virtual WXWidget GetHandle() const { return m_widget; }
 
 
     virtual WXWidget GetHandle() const { return m_widget; }
 

-    // wxWindows callbacks
-    void OnKeyDown( wxKeyEvent &event );
-

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


@@ -131,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


@@ -145,14 +141,14 @@ 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.
+    /* 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
+
+    /* called by SetFont() and SetXXXColour etc */

     void SetWidgetStyle();
     void SetWidgetStyle();

-    
-    // overridden in many GTK widgets
+
+    /* overridden in many GTK widgets */

     virtual void ApplyWidgetStyle();
 
 #if wxUSE_TOOLTIPS
     virtual void ApplyWidgetStyle();
 
 #if wxUSE_TOOLTIPS


@@ -168,11 +164,11 @@ public:
     int                  m_x, m_y;
     int                  m_width, m_height;
 
     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;
     float                m_oldHorizontalPos;
     float                m_oldVerticalPos;
     GtkAdjustment       *m_hAdjust,*m_vAdjust;
     float                m_oldHorizontalPos;
     float                m_oldVerticalPos;


@@ -193,7 +189,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.  */
     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"


@@ -201,6 +197,11 @@ public:
     bool                 m_delayedForegroundColour:1;
     bool                 m_delayedBackgroundColour:1;
     bool                 m_delayedCursor: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
 
     // contains GTK's widgets internal information about non-default widget
     // font and colours. we create one for each widget that gets any


@@ -214,6 +215,8 @@ public:
     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;


@@ -230,7 +233,7 @@ public:
     void Init();
 
 private:
     void Init();
 
 private:

-    DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxWindow);

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