merged in the commit from the 2.2 branch

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

diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h
index 45039a0bd775da6bbed4f00c5aeb8cc0f0ece7d1..4b297ddf323b6e5c697da75d4b1aeb4333b7f247 100644 (file)
--- a/include/wx/gtk/notebook.h
+++ b/include/wx/gtk/notebook.h
@@ -29,7 +29,14 @@
 
 class wxImageList;
 class wxNotebook;
-class wxNotebookPage;
+
+typedef wxWindow wxNotebookPage;  // so far, any window can be a page
+
+//-----------------------------------------------------------------------------
+// internal class
+//-----------------------------------------------------------------------------
+
+class wxGtkNotebookPage;
 
 //-----------------------------------------------------------------------------
 // wxNotebook
@@ -82,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; }
 
@@ -112,19 +120,19 @@ public:
   
     // adds a new page to the notebook (it will be deleted ny the notebook,
     // don't delete it yourself). If bSelect, this page becomes active.
-  bool AddPage( wxWindow *win,
-                const wxString& strText,
-                bool select = FALSE,
-                int imageId = -1 );
+    bool AddPage( wxNotebookPage *win,
+                  const wxString& strText,
+                  bool select = FALSE,
+                  int imageId = -1 );
     // the same as AddPage(), but adds it at the specified position
-  bool InsertPage( int position,
-                   wxWindow *win,
-                   const wxString& strText,
-                   bool bSelect = FALSE,
-                   int imageId = -1 );
+    bool InsertPage( int position,
+                     wxNotebookPage *win,
+                     const wxString& strText,
+                     bool bSelect = FALSE,
+                     int imageId = -1 );
 
     // get the panel which represents the given page
-  wxWindow *GetPage(int nPage) const;
+    wxNotebookPage *GetPage(int nPage) const;
 
     // handler for tab navigation
     // --------------------------
@@ -133,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  
@@ -144,9 +155,10 @@ public:
     void Init();
 
     // helper function
-    wxNotebookPage* GetNotebookPage(int page) const;
+    wxGtkNotebookPage* GetNotebookPage(int page) const;
 
     wxImageList*    m_imageList;
+    bool            m_ownsImageList;
     wxList          m_pages;
     int             m_lastSelection;  /* hack */