Some OS/2 updates

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

diff --git a/include/wx/generic/notebook.h b/include/wx/generic/notebook.h
index 4b3ed0980c741ca1a7b3c5268c4e5153dd7ef8d8..53582ba352c9f344055a6903be6900195091d07a 100644 (file)
--- a/include/wx/generic/notebook.h
+++ b/include/wx/generic/notebook.h
@@ -31,9 +31,12 @@
 class WXDLLEXPORT wxImageList;
 class WXDLLEXPORT wxWindow;
 
 class WXDLLEXPORT wxImageList;
 class WXDLLEXPORT wxWindow;
 

+// Already defined in wx/notebook.h
+#if 0

 // array of notebook pages
 typedef wxWindow wxNotebookPage;  // so far, any window can be a page
 WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages);
 // array of notebook pages
 typedef wxWindow wxNotebookPage;  // so far, any window can be a page
 WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages);

+#endif

 
 // ----------------------------------------------------------------------------
 // wxNotebook
 
 // ----------------------------------------------------------------------------
 // wxNotebook


@@ -56,7 +59,7 @@ protected:
    wxNotebook*      m_notebook;
 };
 
    wxNotebook*      m_notebook;
 };
 

-class wxNotebook : public wxControl
+class wxNotebook : public wxNotebookBase

 {
 public:
   // ctors
 {
 public:
   // ctors


@@ -82,9 +85,6 @@ public:
 
   // accessors
   // ---------
 
   // accessors
   // ---------

-    // get number of pages in the dialog
-  int GetPageCount() const;
-

   // Find the position of the wxNotebookPage, -1 if not found.
   int FindPagePosition(wxNotebookPage* page) const;
 
   // Find the position of the wxNotebookPage, -1 if not found.
   int FindPagePosition(wxNotebookPage* page) const;
 


@@ -93,7 +93,7 @@ public:
     // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
   int SetSelection(int nPage);
     // cycle thru the tabs
     // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
   int SetSelection(int nPage);
     // cycle thru the tabs

-  void AdvanceSelection(bool bForward = TRUE);
+  //  void AdvanceSelection(bool bForward = TRUE);

     // get the currently selected page
   int GetSelection() const { return m_nSelection; }
 
     // get the currently selected page
   int GetSelection() const { return m_nSelection; }
 


@@ -101,24 +101,14 @@ public:
   bool SetPageText(int nPage, const wxString& strText);
   wxString GetPageText(int nPage) const;
 
   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_pImageList; }
+  // get the number of rows for a control with wxNB_MULTILINE style (not all
+  // versions support it - they will always return 1 then)
+  virtual int GetRowCount() const ;

 
     // sets/returns item's image index in the current image list
   int  GetPageImage(int nPage) const;
   bool SetPageImage(int nPage, int nImage);
 
 
     // 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);
   // control the appearance of the notebook pages
     // set the size (the same for all pages)
   void SetPageSize(const wxSize& size);


@@ -138,20 +128,12 @@ public:
   bool RemovePage(wxNotebookPage* page);
     // remove all pages
   bool DeleteAllPages();
   bool RemovePage(wxNotebookPage* page);
     // 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 *pPage,
-               const wxString& strText,
-               bool bSelect = FALSE,
-               int imageId = -1);

     // the same as AddPage(), but adds it at the specified position
   bool InsertPage(int nPage,
                   wxNotebookPage *pPage,
                   const wxString& strText,
                   bool bSelect = FALSE,
                   int imageId = -1);
     // the same as AddPage(), but adds it at the specified position
   bool InsertPage(int nPage,
                   wxNotebookPage *pPage,
                   const wxString& strText,
                   bool bSelect = FALSE,
                   int imageId = -1);

-    // get the panel which represents the given page
-  wxNotebookPage *GetPage(int nPage) { return m_aPages[nPage]; }

 
   // callbacks
   // ---------
 
   // callbacks
   // ---------


@@ -189,9 +171,11 @@ protected:
   // helper functions
   void ChangePage(int nOldSel, int nSel); // change pages
 
   // helper functions
   void ChangePage(int nOldSel, int nSel); // change pages
 

+#if 0

   wxImageList  *m_pImageList; // we can have an associated image list
   wxArrayPages  m_aPages;     // array of pages
   wxImageList  *m_pImageList; // we can have an associated image list
   wxArrayPages  m_aPages;     // array of pages

-
+#endif
+  

   int m_nSelection;           // the current selection (-1 if none)
 
   wxTabView*   m_tabView;
   int m_nSelection;           // the current selection (-1 if none)
 
   wxTabView*   m_tabView;