wxStaticBitmapBase::DoGetBestSize

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

diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index 7d1f7cc5fc52b192e6ef193e60cc82c3cb3eb267..d29d1a32e15633e9ae51bedadb5ae3c1fbf474fc 100644 (file)
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -56,15 +56,11 @@ public:
     wxNotebookBase() { }
 
     wxNotebookBase(wxWindow *parent,
-                   wxWindowID id,
+                   wxWindowID winid,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
-                   const wxString& name = wxNOTEBOOK_NAME)
-        : wxBookCtrl(parent, id, pos, size, style, name)
-    {
-    }
-
+                   const wxString& name = wxNOTEBOOK_NAME) ;
 
     // wxNotebook-specific additions to wxBookCtrl interface
     // -----------------------------------------------------
@@ -102,9 +98,9 @@ protected:
 class WXDLLEXPORT wxNotebookEvent : public wxBookCtrlEvent
 {
 public:
-    wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,
+    wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int winid = 0,
                     int nSel = -1, int nOldSel = -1)
-        : wxBookCtrlEvent(commandType, id, nSel, nOldSel)
+        : wxBookCtrlEvent(commandType, winid, nSel, nOldSel)
     {
     }
 
@@ -119,21 +115,21 @@ END_DECLARE_EVENT_TYPES()
 
 typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
 
-#define EVT_NOTEBOOK_PAGE_CHANGED(id, fn)                                   \
+#define EVT_NOTEBOOK_PAGE_CHANGED(winid, fn)                                   \
   DECLARE_EVENT_TABLE_ENTRY(                                                \
     wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,                                    \
-    id,                                                                     \
+    winid,                                                                     \
     -1,                                                                     \
-    (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn,  \
+    (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxNotebookEventFunction, &fn ),  \
     NULL                                                                    \
   ),
 
-#define EVT_NOTEBOOK_PAGE_CHANGING(id, fn)                                  \
+#define EVT_NOTEBOOK_PAGE_CHANGING(winid, fn)                                  \
   DECLARE_EVENT_TABLE_ENTRY(                                                \
     wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,                                   \
-    id,                                                                     \
+    winid,                                                                     \
     -1,                                                                     \
-    (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn,  \
+    (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxNotebookEventFunction, &fn ),  \
     NULL                                                                    \
   ),