X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ce404dd7b42723cbeabb6928fddf340d26235d2..04e8174b84ae91681417eb06fc54d3660e306606:/include/wx/gtk1/notebook.h?ds=sidebyside

diff --git a/include/wx/gtk1/notebook.h b/include/wx/gtk1/notebook.h
index ddb9ea01a3..2d10456907 100644
--- a/include/wx/gtk1/notebook.h
+++ b/include/wx/gtk1/notebook.h
@@ -4,15 +4,15 @@
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __NOTEBOOKH__
-#define __NOTEBOOKH__
+#ifndef __GTKNOTEBOOKH__
+#define __GTKNOTEBOOKH__
 
 #ifdef __GNUG__
-#pragma interface "notebook.h"
+#pragma interface
 #endif
 
 #include "wx/defs.h"
@@ -28,28 +28,6 @@ class wxImageList;
 class wxNotebook;
 class wxNotebookPage;
 
-// ----------------------------------------------------------------------------
-// notebook events
-// ----------------------------------------------------------------------------
-
-class wxNotebookEvent : public wxCommandEvent
-{
-public:
-  wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,
-                  int nSel = -1, int nOldSel = -1)
-    : wxCommandEvent(commandType, id) { m_nSel = nSel; m_nOldSel = nOldSel; }
-
-  // accessors
-  int GetSelection() const { return m_nSel; }
-  int GetOldSelection() const { return m_nOldSel; }
-
-private:
-  int m_nSel,     // currently selected page
-      m_nOldSel;  // previously selected page
-
-  DECLARE_DYNAMIC_CLASS(wxNotebookEvent)
-};
-
 //-----------------------------------------------------------------------------
 // wxNotebook
 //-----------------------------------------------------------------------------
@@ -104,7 +82,7 @@ public:
     // 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;
@@ -119,32 +97,45 @@ public:
   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
   // ----------
+    // 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(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;
 
+  void OnNavigationKey(wxNavigationKeyEvent& event);
+
   // implementation
-  // --------------
-    // base class virtuals
-  virtual void AddChild(wxWindow *child);
-  virtual void SetConstraintSizes(bool recurse);
-  virtual bool DoPhase(int phase);
 
-private:
+  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();
 
@@ -153,33 +144,11 @@ private:
 
   wxImageList*    m_imageList;
   wxList          m_pages;
-  size_t            m_idHandler; // the change page handler id
+  int             m_lastSelection;  /* hack */
 
   DECLARE_DYNAMIC_CLASS(wxNotebook)
+  DECLARE_EVENT_TABLE()
 };
 
-// ----------------------------------------------------------------------------
-// event macros
-// ----------------------------------------------------------------------------
-typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
-
-#define EVT_NOTEBOOK_PAGE_CHANGED(id, fn)                                   \
-  {                                                                         \
-    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,                                    \
-    id,                                                                     \
-    -1,                                                                     \
-    (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn,  \
-    NULL                                                                    \
-  },
-
-#define EVT_NOTEBOOK_PAGE_CHANGING(id, fn)                                  \
-  {                                                                         \
-    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,                                   \
-    id,                                                                     \
-    -1,                                                                     \
-    (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn,  \
-    NULL                                                                    \
-  },
-
 #endif
-    // __NOTEBOOKH__
+    // __GTKNOTEBOOKH__