"unsigned char" restored in wxColour ctor

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

diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h
index e423b69564a92670c934d7a716914153f8425288..92d011ac2b6863b7b71f35937e7c0458b793c07a 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,8 +8,8 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __TABCTRLH__
-#define __TABCTRLH__
+#ifndef __NOTEBOOKH__
+#define __NOTEBOOKH__

 
 #ifdef __GNUG__
 #pragma interface "notebook.h"
 
 #ifdef __GNUG__
 #pragma interface "notebook.h"


@@ -139,13 +139,12 @@ public:
 
   // implementation
   // --------------
 
   // implementation
   // --------------

-    // callbacks
-  void OnSize(wxSizeEvent&);
-

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

+  virtual void SetFont( const wxFont &font );
+  virtual void SetBackgroundColour( const wxColour &colour );

 
 private:
   // common part of all ctors
 
 private:
   // common part of all ctors


@@ -156,10 +155,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()

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


@@ -178,7 +176,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 +184,4 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
   },
 
 #endif
   },
 
 #endif

-    // __TABCTRLH__
+    // __NOTEBOOKH__