added more files (unchanged) from wxUniv branch

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

diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h
index 4b297ddf323b6e5c697da75d4b1aeb4333b7f247..1f78b6ec273f0a9fbae8173542cbc9eb09ff63e5 100644 (file)
--- a/include/wx/gtk/notebook.h
+++ b/include/wx/gtk/notebook.h
@@ -15,23 +15,6 @@
 #pragma interface
 #endif
 
 #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
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // internal class
 //-----------------------------------------------------------------------------


@@ -42,7 +25,7 @@ class wxGtkNotebookPage;
 // wxNotebook
 //-----------------------------------------------------------------------------
 
 // wxNotebook
 //-----------------------------------------------------------------------------
 

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

 {
 public:
       // default for dynamic class
 {
 public:
       // default for dynamic class


@@ -66,15 +49,11 @@ public:
 
   // accessors
   // ---------
 
   // 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);
 
     // 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;
 
     // get the currently selected page
   int GetSelection() const;
 


@@ -90,17 +69,11 @@ public:
     // associate image list with a control
   void SetImageList(wxImageList* imageList);
   void AssignImageList(wxImageList* imageList);
     // 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; }

 
     // 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);


@@ -111,13 +84,11 @@ public:
 
   // operations
   // ----------
 
   // 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();
     // 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,
     // 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,


@@ -131,9 +102,6 @@ public:
                      bool bSelect = FALSE,
                      int imageId = -1 );
 
                      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);
     // handler for tab navigation
     // --------------------------
     void OnNavigationKey(wxNavigationKeyEvent& event);


@@ -148,7 +116,7 @@ public:
 
     void ApplyWidgetStyle();
 
 
     void ApplyWidgetStyle();
 

-    // report if window belongs to notebook  
+    // report if window belongs to notebook

     bool IsOwnGtkWindow( GdkWindow *window );
 
     // common part of all ctors
     bool IsOwnGtkWindow( GdkWindow *window );
 
     // common part of all ctors


@@ -157,17 +125,21 @@ public:
     // helper function
     wxGtkNotebookPage* GetNotebookPage(int page) const;
 
     // helper function
     wxGtkNotebookPage* GetNotebookPage(int page) const;
 

-    wxImageList*    m_imageList;

     bool            m_ownsImageList;
     wxList          m_pages;
     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;
+
+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()
 };
 
 
 private:
     DECLARE_DYNAMIC_CLASS(wxNotebook)
     DECLARE_EVENT_TABLE()
 };
 

-#endif
-

 #endif
     // __GTKNOTEBOOKH__
 #endif
     // __GTKNOTEBOOKH__