Further wxUniv fixes

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

diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index 934be280476a610ba17b6cc835aef9cdfd04462c..51b4b0bb82c507c1fad715b8a66ea86842f9d91f 100644 (file)
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -15,40 +15,19 @@
   #pragma interface "notebook.h"
 #endif
 
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-#ifndef   _DYNARRAY_H
-  #include <wx/dynarray.h>
-#endif  //_DYNARRAY_H
+#if wxUSE_NOTEBOOK
 
 // ----------------------------------------------------------------------------
-// types
+// headers
 // ----------------------------------------------------------------------------
 
-// fwd declarations
-class WXDLLEXPORT wxImageList;
-class WXDLLEXPORT wxWindow;
-
-// array of notebook pages
-typedef wxWindow WXDLLEXPORT wxNotebookPage;  // so far, any window can be a page
-
-#undef WXDLLEXPORTLOCAL
-#define WXDLLEXPORTLOCAL WXDLLEXPORT
-
-WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages);
-
-#undef  WXDLLEXPORTLOCAL
-#define WXDLLEXPORTLOCAL
+#include "wx/control.h"
 
 // ----------------------------------------------------------------------------
 // wxNotebook
 // ----------------------------------------------------------------------------
 
-// FIXME this class should really derive from wxTabCtrl, but the interface is not
-//       exactly the same, so I can't do it right now and instead we reimplement
-//       part of wxTabCtrl here
-class WXDLLEXPORT wxNotebook : public wxControl
+class WXDLLEXPORT wxNotebook : public wxNotebookBase
 {
 public:
   // ctors
@@ -81,8 +60,6 @@ public:
     // 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 { return m_nSelection; }
 
@@ -97,8 +74,7 @@ public:
   // 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; }
+  void AssignImageList(wxImageList* imageList);
 
     // sets/returns item's image index in the current image list
   int  GetPageImage(int nPage) const;
@@ -118,8 +94,6 @@ public:
   // ----------
     // remove one page from the notebook
   bool DeletePage(int nPage);
-    // remove one page from the notebook, without deleting
-  bool RemovePage(int nPage);
     // remove all pages
   bool DeleteAllPages();
     // adds a new page to the notebook (it will be deleted ny the notebook,
@@ -134,8 +108,6 @@ public:
                   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]; }
 
     // Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH
     // style.
@@ -143,7 +115,7 @@ public:
 
   // callbacks
   // ---------
-  void OnWindowCreate(wxWindowCreateEvent& event);
+  void OnSize(wxSizeEvent& event);
   void OnSelChange(wxNotebookEvent& event);
   void OnSetFocus(wxFocusEvent& event);
   void OnNavigationKey(wxNavigationKeyEvent& event);
@@ -158,11 +130,13 @@ protected:
   // common part of all ctors
   void Init();
 
+  // remove one page from the notebook, without deleting
+  virtual wxNotebookPage *DoRemovePage(int nPage);
+
   // helper functions
   void ChangePage(int nOldSel, int nSel); // change pages
 
-  wxImageList  *m_pImageList; // we can have an associated image list
-  wxArrayPages  m_aPages;     // array of pages
+  bool m_bOwnsImageList;
 
   int m_nSelection;           // the current selection (-1 if none)
 
@@ -170,4 +144,6 @@ protected:
   DECLARE_EVENT_TABLE()
 };
 
+#endif // wxUSE_NOTEBOOK
+
 #endif // _NOTEBOOK_H