X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad9835c97c10c0d7de345e3a7a7c0fc2776eb2cb..3c47c04740b7c456823e0fd31edbdf1e6bfff43b:/src/palmos/toolbar.cpp diff --git a/src/palmos/toolbar.cpp b/src/palmos/toolbar.cpp index 4eece9ff42..886cdcbb70 100644 --- a/src/palmos/toolbar.cpp +++ b/src/palmos/toolbar.cpp @@ -26,6 +26,8 @@ #if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE +#include "wx/toolbar.h" + #ifndef WX_PRECOMP #include "wx/dynarray.h" #include "wx/frame.h" @@ -35,17 +37,15 @@ #include "wx/bitmap.h" #include "wx/dcmemory.h" #include "wx/control.h" + #include "wx/app.h" // for GetComCtl32Version #endif -#include "wx/toolbar.h" #include "wx/sysopt.h" #include "wx/palmos/private.h" #include "wx/palmos/wrapcctl.h" -#include "wx/app.h" // for GetComCtl32Version - // ---------------------------------------------------------------------------- // conditional compilation // ---------------------------------------------------------------------------- @@ -112,8 +112,8 @@ public: { } - wxToolBarTool(wxToolBar *tbar, wxControl *control) - : wxToolBarToolBase(tbar, control) + wxToolBarTool(wxToolBar *tbar, wxControl *control, const wxString& label) + : wxToolBarToolBase(tbar, control, label) { } @@ -154,9 +154,10 @@ wxToolBarToolBase *wxToolBar::CreateTool(int id, clientData, shortHelp, longHelp); } -wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control) +wxToolBarToolBase * +wxToolBar::CreateTool(wxControl *control, const wxString& label) { - return new wxToolBarTool(this, control); + return new wxToolBarTool(this, control, label); } // ----------------------------------------------------------------------------