changed removed wxToUpper to standard toupper

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

diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h
index e423b69564a92670c934d7a716914153f8425288..97c86e7ee9dd577e7e7400c8cdef12f92b22243b 100644 (file)
--- a/include/wx/gtk/notebook.h
+++ b/include/wx/gtk/notebook.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        tabctrl.h
-// Purpose:     wxTabCtrl class
+// Name:        notebook.h
+// Purpose:     wxNotebook class

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

-#ifndef __TABCTRLH__
-#define __TABCTRLH__
+#ifndef __GTKNOTEBOOKH__
+#define __GTKNOTEBOOKH__

 
 #ifdef __GNUG__
 
 #ifdef __GNUG__

-#pragma interface "notebook.h"
+#pragma interface

 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"


@@ -32,18 +32,32 @@ 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) { m_nSel = nSel; m_nOldSel = nOldSel; }
+  : 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; }
 
 
   // 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; }
+

 private:
 private:

+  bool m_bAllow;
+

   int m_nSel,     // currently selected page
       m_nOldSel;  // previously selected page
 
   int m_nSel,     // currently selected page
       m_nOldSel;  // previously selected page
 


@@ -122,6 +136,8 @@ 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
     // remove one page from the notebook
   bool DeletePage(int nPage);
     // remove all pages


@@ -130,24 +146,21 @@ public:
     // don't delete it yourself). If bSelect, this page becomes active.
   bool AddPage(wxWindow *pPage,
                const wxString& strText,
     // don't delete it yourself). If bSelect, this page becomes active.
   bool AddPage(wxWindow *pPage,
                const wxString& strText,

-               bool bSelect = FALSE,
+               bool select = FALSE,

                int imageId = -1);
     // @@@@ VZ: I don't know how to implement InsertPage()
 
     // get the panel which represents the given page
   wxWindow *GetPage(int nPage) const;
 
                int imageId = -1);
     // @@@@ VZ: I don't know how to implement InsertPage()
 
     // get the panel which represents the given page
   wxWindow *GetPage(int nPage) const;
 

+  void OnNavigationKey(wxNavigationKeyEvent& event);
+  

   // implementation
   // implementation

-  // --------------
-    // callbacks
-  void OnSize(wxSizeEvent&);
+  
+  void SetConstraintSizes(bool recurse);
+  bool DoPhase(int phase);
+  void ApplyWidgetStyle();

 
 

-    // base class virtuals
-  virtual void AddChild(wxWindow *child);
-  virtual void SetConstraintSizes(bool recurse);
-  virtual bool DoPhase(int phase);
-
-private:

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


@@ -156,7 +169,7 @@ private:
 
   wxImageList*    m_imageList;
   wxList          m_pages;
 
   wxImageList*    m_imageList;
   wxList          m_pages;

-  uint            m_idHandler; // the change page handler id
+  size_t            m_idHandler; // the change page handler id

 
   DECLARE_DYNAMIC_CLASS(wxNotebook)
   DECLARE_EVENT_TABLE()
 
   DECLARE_DYNAMIC_CLASS(wxNotebook)
   DECLARE_EVENT_TABLE()


@@ -178,7 +191,7 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
 
 #define EVT_NOTEBOOK_PAGE_CHANGING(id, fn)                                  \
   {                                                                         \
 
 #define EVT_NOTEBOOK_PAGE_CHANGING(id, fn)                                  \
   {                                                                         \

-    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, \                                 \
+    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,                                   \

     id,                                                                     \
     -1,                                                                     \
     (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn,  \
     id,                                                                     \
     -1,                                                                     \
     (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn,  \


@@ -186,4 +199,4 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
   },
 
 #endif
   },
 
 #endif

-    // __TABCTRLH__
+    // __GTKNOTEBOOKH__