Some OS/2 updates

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

diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h
index 910605567220a72d932dd07079bd545784a3eaa5..b2111426999e137501bd139545c164fd4d5cc423 100644 (file)
--- a/include/wx/gtk/notebook.h
+++ b/include/wx/gtk/notebook.h
@@ -15,34 +15,20 @@
 #pragma interface
 #endif
 
-#include "wx/defs.h"
-
-#if wxUSE_NOTEBOOK
-
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/control.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxImageList;
-class wxNotebook;
-
-typedef wxWindow wxNotebookPage;  // so far, any window can be a page
-
 //-----------------------------------------------------------------------------
 // internal class
 //-----------------------------------------------------------------------------
 
 class wxGtkNotebookPage;
 
+#include "wx/list.h"
+WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList);
+
 //-----------------------------------------------------------------------------
 // wxNotebook
 //-----------------------------------------------------------------------------
 
-class wxNotebook : public wxControl
+class wxNotebook : public wxNotebookBase
 {
 public:
       // default for dynamic class
@@ -62,19 +48,15 @@ public:
               long style = 0,
               const wxString& name = "notebook");
       // dtor
-    ~wxNotebook();
+    virtual ~wxNotebook();
 
   // accessors
   // ---------
-    // get number of pages in the dialog
-  int GetPageCount() const;
 
     // set the currently selected page, return the index of the previously
     // selected one (or -1 on error)
     // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
   int SetSelection(int nPage);
-    // cycle thru the tabs
-  void AdvanceSelection(bool bForward = TRUE);
     // get the currently selected page
   int GetSelection() const;
 
@@ -82,24 +64,10 @@ public:
   bool SetPageText(int nPage, const wxString& strText);
   wxString GetPageText(int nPage) const;
 
-  // image list stuff: each page may have an image associated with it. All
-  // the images belong to an image list, so you have to
-  // 1) create an image list
-  // 2) associate it with the notebook
-  // 3) set for each page it's image
-    // associate image list with a control
-  void SetImageList(wxImageList* imageList);
-    // get pointer (may be NULL) to the associated image list
-  wxImageList *GetImageList() const { return m_imageList; }
-
     // sets/returns item's image index in the current image list
   int  GetPageImage(int nPage) const;
   bool SetPageImage(int nPage, int nImage);
 
-    // currently it's always 1 because wxGTK doesn't support multi-row
-    // tab controls
-  int GetRowCount() const;
-
   // control the appearance of the notebook pages
     // set the size (the same for all pages)
   void SetPageSize(const wxSize& size);
@@ -110,19 +78,13 @@ public:
 
   // operations
   // ----------
-    // remove one page from the notebook but do not destroy it
-  bool RemovePage(int nPage);
     // remove one page from the notebook
   bool DeletePage(int nPage);
     // remove all pages
   bool DeleteAllPages();
-  
+
     // 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( 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,
                      wxNotebookPage *win,
@@ -130,9 +92,6 @@ public:
                      bool bSelect = FALSE,
                      int imageId = -1 );
 
-    // get the panel which represents the given page
-    wxNotebookPage *GetPage(int nPage) const;
-
     // handler for tab navigation
     // --------------------------
     void OnNavigationKey(wxNavigationKeyEvent& event);
@@ -140,11 +99,14 @@ public:
     // implementation
     // --------------
 
+#if wxUSE_CONSTRAINTS
     void SetConstraintSizes(bool recurse);
     bool DoPhase(int phase);
+#endif
+
     void ApplyWidgetStyle();
 
-    // report if window belongs to notebook  
+    // report if window belongs to notebook
     bool IsOwnGtkWindow( GdkWindow *window );
 
     // common part of all ctors
@@ -153,16 +115,21 @@ public:
     // helper function
     wxGtkNotebookPage* GetNotebookPage(int page) const;
 
-    wxImageList*    m_imageList;
-    wxList          m_pages;
-    int             m_lastSelection;  /* hack */
+    // the additional page data (the pages themselves are in m_pages array)
+    wxGtkNotebookPagesList m_pagesData;
+
+    // for reasons explained in gtk/notebook.cpp we store the current
+    // selection internally instead of querying the notebook for it
+    int m_selection;
+
+protected:
+    // remove one page from the notebook but do not destroy it
+    virtual wxNotebookPage *DoRemovePage(int nPage);
 
 private:
     DECLARE_DYNAMIC_CLASS(wxNotebook)
     DECLARE_EVENT_TABLE()
 };
 
-#endif
-
 #endif
     // __GTKNOTEBOOKH__