X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/324eeecb3cdc9522e136af6670443148772b412a..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/palmos/toolbar.cpp?ds=inline diff --git a/src/palmos/toolbar.cpp b/src/palmos/toolbar.cpp index 8a483b74f5..886cdcbb70 100644 --- a/src/palmos/toolbar.cpp +++ b/src/palmos/toolbar.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "toolbar.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,28 +24,28 @@ #pragma hdrstop #endif +#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE + +#include "wx/toolbar.h" + #ifndef WX_PRECOMP + #include "wx/dynarray.h" #include "wx/frame.h" #include "wx/log.h" #include "wx/intl.h" - #include "wx/dynarray.h" #include "wx/settings.h" #include "wx/bitmap.h" #include "wx/dcmemory.h" #include "wx/control.h" + #include "wx/app.h" // for GetComCtl32Version #endif -#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE - -#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 // ---------------------------------------------------------------------------- @@ -116,8 +112,8 @@ public: { } - wxToolBarTool(wxToolBar *tbar, wxControl *control) - : wxToolBarToolBase(tbar, control) + wxToolBarTool(wxToolBar *tbar, wxControl *control, const wxString& label) + : wxToolBarToolBase(tbar, control, label) { } @@ -158,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); } // ---------------------------------------------------------------------------- @@ -272,4 +269,3 @@ void wxToolBar::OnMouseEvent(wxMouseEvent& event) } #endif // wxUSE_TOOLBAR -