wxGTK compiles (and seems to work) again after wxMenu changes

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

diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h
index fbbc2b18c12c42d5f7ea4cef491e55cef0189472..9ec7f12639c5eb1486e2b3540481e8a37697c0c9 100644 (file)
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/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();
@@ -120,9 +120,8 @@ 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();
 
     /* internal addition of child windows. differs from class
@@ -173,23 +172,19 @@ public:
     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
-    bool                 m_needParent:1;    /* ! wxFrame, wxDialog, wxNotebookPage ?  */
+    bool                 m_needParent:1;        /* ! wxFrame, wxDialog, wxNotebookPage ?  */
+    bool                 m_noExpose:1;          /* wxGLCanvas has its own redrawing */
+    bool                 m_nativeSizeEvent:1;   /* wxGLCanvas sends wxSizeEvent upon "alloc_size" */
     bool                 m_hasScrolling:1;
     bool                 m_isScrolling:1;
     bool                 m_hasVMT:1;
     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_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;   /* not wxStaticBox, not wxStaticBitmap 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
@@ -197,13 +192,7 @@ public:
     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() /