Rewrote wxNotebook, incl. PAGE_CHANGING event

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

diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h
index 8cfa171f7e677c823ffafda6cec08362e9ce9f30..13b3f0b00994bbbeb8f0743bf9299061a5ebb9d4 100644 (file)
--- a/include/wx/gtk/notebook.h
+++ b/include/wx/gtk/notebook.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Modified by:
 // RCS-ID:      $Id$
 // Author:      Robert Roebling
 // Modified by:
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart and Robert Roebling

 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 


@@ -32,12 +32,12 @@ class wxNotebookPage;
 // notebook events
 // ----------------------------------------------------------------------------
 
 // notebook events
 // ----------------------------------------------------------------------------
 

-class wxNotebookEvent : public wxCommandEvent
+class wxNotebookEvent : public wxNotifyEvent

 {
 public:
   wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,
                   int nSel = -1, int nOldSel = -1)
 {
 public:
   wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,
                   int nSel = -1, int nOldSel = -1)

-  : wxCommandEvent(commandType, id)
+  : wxNotifyEvent(commandType, id)

   {
       m_bAllow = TRUE;
       m_nSel = nSel;
   {
       m_bAllow = TRUE;
       m_nSel = nSel;


@@ -118,7 +118,7 @@ public:
     // associate image list with a control
   void SetImageList(wxImageList* imageList);
     // get pointer (may be NULL) to the associated image list
     // 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; }
+  wxImageList *GetImageList() const { return m_imageList; }

 
     // sets/returns item's image index in the current image list
   int  GetPageImage(int nPage) const;
 
     // sets/returns item's image index in the current image list
   int  GetPageImage(int nPage) const;


@@ -133,6 +133,8 @@ public:
   void SetPageSize(const wxSize& size);
     // set the padding between tabs (in pixels)
   void SetPadding(const wxSize& padding);
   void SetPageSize(const wxSize& size);
     // set the padding between tabs (in pixels)
   void SetPadding(const wxSize& padding);

+    // sets the size of the tabs (assumes all tabs are the same size)
+  void SetTabSize(const wxSize& sz);

 
   // operations
   // ----------
 
   // operations
   // ----------


@@ -142,24 +144,34 @@ public:
   bool DeletePage(int nPage);
     // remove all pages
   bool DeleteAllPages();
   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.
     // 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 *pPage,
-               const wxString& strText,
-               bool bSelect = FALSE,
-               int imageId = -1);
-    // @@@@ VZ: I don't know how to implement InsertPage()
+  bool AddPage( wxWindow *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 );

 
     // get the panel which represents the given page
   wxWindow *GetPage(int nPage) const;
 
 
     // get the panel which represents the given page
   wxWindow *GetPage(int nPage) const;
 

-  
+  void OnNavigationKey(wxNavigationKeyEvent& event);
+

   // implementation
   // implementation

-  
+

   void SetConstraintSizes(bool recurse);
   bool DoPhase(int phase);
   void ApplyWidgetStyle();
 
   void SetConstraintSizes(bool recurse);
   bool DoPhase(int phase);
   void ApplyWidgetStyle();
 

+  // report if window belongs to notebook  
+  bool IsOwnGtkWindow( GdkWindow *window );
+

   // common part of all ctors
   void Init();
 
   // common part of all ctors
   void Init();
 


@@ -168,9 +180,9 @@ public:
 
   wxImageList*    m_imageList;
   wxList          m_pages;
 
   wxImageList*    m_imageList;
   wxList          m_pages;

-  size_t            m_idHandler; // the change page handler id

 
   DECLARE_DYNAMIC_CLASS(wxNotebook)
 
   DECLARE_DYNAMIC_CLASS(wxNotebook)

+  DECLARE_EVENT_TABLE()

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------