Support for Cygwin 1.0 (thought it worked before, but...)

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

diff --git a/include/wx/gtk1/notebook.h b/include/wx/gtk1/notebook.h
index 910605567220a72d932dd07079bd545784a3eaa5..45d6eecfbf2a7539f32cfb162c4ce5cec7f28c40 100644 (file)
--- a/include/wx/gtk1/notebook.h
+++ b/include/wx/gtk1/notebook.h
@@ -89,6 +89,7 @@ public:
   // 3) set for each page it's image
     // associate image list with a control
   void SetImageList(wxImageList* imageList);
+  void AssignImageList(wxImageList* imageList);
     // get pointer (may be NULL) to the associated image list
   wxImageList *GetImageList() const { return m_imageList; }
 
@@ -140,8 +141,11 @@ public:
     // implementation
     // --------------
 
+#if wxUSE_CONSTRAINTS
     void SetConstraintSizes(bool recurse);
     bool DoPhase(int phase);
+#endif
+
     void ApplyWidgetStyle();
 
     // report if window belongs to notebook  
@@ -154,8 +158,12 @@ public:
     wxGtkNotebookPage* GetNotebookPage(int page) const;
 
     wxImageList*    m_imageList;
+    bool            m_ownsImageList;
     wxList          m_pages;
-    int             m_lastSelection;  /* hack */
+
+    // for reasons explained in gtk/notebook.cpp we store the current
+    // selection internally instead of querying the notebook for it
+    int             m_selection;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxNotebook)