added another ParseFormat() overload for better backwards compatibility

[wxWidgets.git] / src / generic / toolbkg.cpp

diff --git a/src/generic/toolbkg.cpp b/src/generic/toolbkg.cpp
index 310c29ab71d29dbc5eb4beaec420a652bc9b3a6e..3ba71c29ab4f225d0169360645b5420dcc887e5f 100644 (file)
--- a/src/generic/toolbkg.cpp
+++ b/src/generic/toolbkg.cpp
@@ -46,11 +46,8 @@
 IMPLEMENT_DYNAMIC_CLASS(wxToolbook, wxBookCtrlBase)
 IMPLEMENT_DYNAMIC_CLASS(wxToolbookEvent, wxNotifyEvent)
 
 IMPLEMENT_DYNAMIC_CLASS(wxToolbook, wxBookCtrlBase)
 IMPLEMENT_DYNAMIC_CLASS(wxToolbookEvent, wxNotifyEvent)
 

-#if !WXWIN_COMPATIBILITY_EVENT_TYPES

 const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING = wxNewEventType();
 const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED = wxNewEventType();
 const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING = wxNewEventType();
 const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED = wxNewEventType();

-#endif
-const int wxID_TOOLBOOKTOOLBAR = wxNewId();

 
 BEGIN_EVENT_TABLE(wxToolbook, wxBookCtrlBase)
     EVT_SIZE(wxToolbook::OnSize)
 
 BEGIN_EVENT_TABLE(wxToolbook, wxBookCtrlBase)
     EVT_SIZE(wxToolbook::OnSize)


@@ -102,7 +99,7 @@ bool wxToolbook::Create(wxWindow *parent,
         m_bookctrl = new wxButtonToolBar
                  (
                     this,
         m_bookctrl = new wxButtonToolBar
                  (
                     this,

-                    wxID_TOOLBOOKTOOLBAR,
+                    wxID_ANY,

                     wxDefaultPosition,
                     wxDefaultSize,
                     orient|wxTB_TEXT|wxTB_FLAT|wxNO_BORDER
                     wxDefaultPosition,
                     wxDefaultSize,
                     orient|wxTB_TEXT|wxTB_FLAT|wxNO_BORDER


@@ -114,7 +111,7 @@ bool wxToolbook::Create(wxWindow *parent,
         m_bookctrl = new wxToolBar
                  (
                     this,
         m_bookctrl = new wxToolBar
                  (
                     this,

-                    wxID_TOOLBOOKTOOLBAR,
+                    wxID_ANY,

                     wxDefaultPosition,
                     wxDefaultSize,
                     orient|wxTB_TEXT|wxTB_FLAT|wxTB_NODIVIDER|wxNO_BORDER
                     wxDefaultPosition,
                     wxDefaultSize,
                     orient|wxTB_TEXT|wxTB_FLAT|wxTB_NODIVIDER|wxNO_BORDER