no message

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

diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h
index 57d67e6b42d2b75dd3a77ad1871784e1c6c76fcf..46ae493e5771584ac8839639cb7eb18e0f62e9fb 100644 (file)
--- a/include/wx/gtk/notebook.h
+++ b/include/wx/gtk/notebook.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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


@@ -8,11 +8,11 @@
 // 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"


@@ -31,10 +31,11 @@ class wxNotebookPage;
 // ----------------------------------------------------------------------------
 // notebook events
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // notebook events
 // ----------------------------------------------------------------------------

+

 class wxNotebookEvent : public wxCommandEvent
 {
 public:
 class wxNotebookEvent : public wxCommandEvent
 {
 public:

-  wxNotebookEvent(WXTYPE commandType = 0, int id = 0,
+  wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,

                   int nSel = -1, int nOldSel = -1)
     : wxCommandEvent(commandType, id) { m_nSel = nSel; m_nOldSel = nOldSel; }
 
                   int nSel = -1, int nOldSel = -1)
     : wxCommandEvent(commandType, id) { m_nSel = nSel; m_nOldSel = nOldSel; }
 


@@ -62,17 +63,17 @@ public:
   wxNotebook();
     // the same arguments as for wxControl (@@@ any special styles?)
   wxNotebook(wxWindow *parent,
   wxNotebook();
     // the same arguments as for wxControl (@@@ any special styles?)
   wxNotebook(wxWindow *parent,

-             const wxWindowID id,
+             wxWindowID id,

              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,

-             const long style = 0,
+             long style = 0,

              const wxString& name = "notebook");
     // Create() function
   bool Create(wxWindow *parent,
              const wxString& name = "notebook");
     // Create() function
   bool Create(wxWindow *parent,

-              const wxWindowID id,
+              wxWindowID id,

               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,

-              const long style = 0,
+              long style = 0,

               const wxString& name = "notebook");
     // dtor
   ~wxNotebook();
               const wxString& name = "notebook");
     // dtor
   ~wxNotebook();


@@ -136,14 +137,13 @@ public:
     // 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;
 

-  // base class virtuals
-  virtual void AddChild(wxWindow *child);
-
-protected:
-  // wxWin callbacks
-  void OnSize(wxSizeEvent& event);
+  
+  // implementation
+  
+  void SetConstraintSizes(bool recurse);
+  bool DoPhase(int phase);
+  void ApplyWidgetStyle();

 
 

-private:

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


@@ -152,10 +152,9 @@ 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_DYNAMIC_CLASS(wxNotebook)

-  DECLARE_EVENT_TABLE()

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


@@ -174,7 +173,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,  \


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

-    // __TABCTRLH__
+    // __GTKNOTEBOOKH__