Implemented Chuck Messenger's naming and simplification improvements,

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

diff --git a/include/wx/gtk1/notebook.h b/include/wx/gtk1/notebook.h
index 1c2aa872b97b2a513246586217d19207d5f993db..4b297ddf323b6e5c697da75d4b1aeb4333b7f247 100644 (file)
--- a/include/wx/gtk1/notebook.h
+++ b/include/wx/gtk1/notebook.h
@@ -16,6 +16,9 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_NOTEBOOK
+

 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/control.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/control.h"


@@ -26,43 +29,14 @@
 
 class wxImageList;
 class wxNotebook;
 
 class wxImageList;
 class wxNotebook;

-class wxNotebookPage;
-
-// ----------------------------------------------------------------------------
-// notebook events
-// ----------------------------------------------------------------------------
-
-class wxNotebookEvent : public wxNotifyEvent
-{
-public:
-  wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,
-                  int nSel = -1, int nOldSel = -1)
-  : wxNotifyEvent(commandType, id)
-  {
-      m_bAllow = TRUE;
-      m_nSel = nSel;
-      m_nOldSel = nOldSel;
-  }

 
 

-  // accessors
-  int GetSelection() const { return m_nSel; }
-  int GetOldSelection() const { return m_nOldSel; }
-
-  // for wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING event this method may be called
-  // to disallow the page change
-  void Veto() { m_bAllow = FALSE; }
-
-  // implementation: for wxNotebook usage only
-  bool Allowed() const { return m_bAllow; }
+typedef wxWindow wxNotebookPage;  // so far, any window can be a page

 
 

-private:
-  bool m_bAllow;
-
-  int m_nSel,     // currently selected page
-      m_nOldSel;  // previously selected page
+//-----------------------------------------------------------------------------
+// internal class
+//-----------------------------------------------------------------------------

 
 

-  DECLARE_DYNAMIC_CLASS(wxNotebookEvent)
-};
+class wxGtkNotebookPage;

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


@@ -71,26 +45,24 @@ private:
 class wxNotebook : public wxControl
 {
 public:
 class wxNotebook : public wxControl
 {
 public:

-  // ctors
-  // -----
-    // default for dynamic class
-  wxNotebook();
-    // the same arguments as for wxControl (@@@ any special styles?)
-  wxNotebook(wxWindow *parent,
+      // default for dynamic class
+    wxNotebook();
+      // the same arguments as for wxControl
+    wxNotebook(wxWindow *parent,

              wxWindowID id,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxString& name = "notebook");
              wxWindowID id,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxString& name = "notebook");

-    // Create() function
-  bool Create(wxWindow *parent,
+      // Create() function
+    bool Create(wxWindow *parent,

               wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,
               const wxString& name = "notebook");
               wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,
               const wxString& name = "notebook");

-    // dtor
-  ~wxNotebook();
+      // dtor
+    ~wxNotebook();

 
   // accessors
   // ---------
 
   // accessors
   // ---------


@@ -117,8 +89,9 @@ public:
   // 3) set for each page it's image
     // associate image list with a control
   void SetImageList(wxImageList* imageList);
   // 3) set for each page it's image
     // associate image list with a control
   void SetImageList(wxImageList* imageList);

+  void AssignImageList(wxImageList* imageList);

     // get pointer (may be NULL) to the associated image list
     // 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 +106,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,59 +117,57 @@ 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 select = FALSE,
-               int imageId = -1);
-    // @@@@ VZ: I don't know how to implement InsertPage()
+    bool AddPage( wxNotebookPage *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,
+                     wxNotebookPage *win,
+                     const wxString& strText,
+                     bool bSelect = FALSE,
+                     int imageId = -1 );

 
     // get the panel which represents the given page
 
     // get the panel which represents the given page

-  wxWindow *GetPage(int nPage) const;
+    wxNotebookPage *GetPage(int nPage) const;

 
 

-  
-  // implementation
-  
-  void SetConstraintSizes(bool recurse);
-  bool DoPhase(int phase);
-  void ApplyWidgetStyle();
+    // handler for tab navigation
+    // --------------------------
+    void OnNavigationKey(wxNavigationKeyEvent& event);
+
+    // implementation
+    // --------------

 
 

-  // common part of all ctors
-  void Init();
+#if wxUSE_CONSTRAINTS
+    void SetConstraintSizes(bool recurse);
+    bool DoPhase(int phase);
+#endif
+
+    void ApplyWidgetStyle();
+
+    // report if window belongs to notebook  
+    bool IsOwnGtkWindow( GdkWindow *window );

 
 

-  // helper function
-  wxNotebookPage* GetNotebookPage(int page) const;
+    // common part of all ctors
+    void Init();

 
 

-  wxImageList*    m_imageList;
-  wxList          m_pages;
-  size_t            m_idHandler; // the change page handler id
+    // helper function
+    wxGtkNotebookPage* GetNotebookPage(int page) const;

 
 

-  DECLARE_DYNAMIC_CLASS(wxNotebook)
+    wxImageList*    m_imageList;
+    bool            m_ownsImageList;
+    wxList          m_pages;
+    int             m_lastSelection;  /* hack */
+
+private:
+    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

 
 #endif
     // __GTKNOTEBOOKH__
 
 #endif
     // __GTKNOTEBOOKH__