- // Simple toolbar no longer available, so we will need to have
- // a generic toolbar at some point (perhaps the wxUniv toolbar)
- #if 0 // !wxUSE_TOOLBAR_NATIVE && !defined(__WXUNIVERSAL__)
- #include "wx/tbarsmpl.h"
-
- class WXDLLEXPORT wxToolBar : public wxToolBarSimple
- {
- public:
- wxToolBar() { }
-
- wxToolBar(wxWindow *parent,
- wxWindowID winid,
- const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize,
- long style = wxNO_BORDER | wxTB_HORIZONTAL,
- const wxString& name = wxToolBarNameStr)
- : wxToolBarSimple(parent, winid, pos, size, style, name) { }
-
- // the most commonly used version of AddTool()
- wxToolBarToolBase *AddTool(int toolid,
- const wxBitmap& bitmap,
- const wxString& shortHelpString = wxEmptyString,
- const wxString& longHelpString = wxEmptyString)
- {
- return wxToolBarSimple::AddTool(toolid, bitmap, wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL,
- shortHelpString, longHelpString);
- }
-
- // old form
- wxToolBarToolBase *AddTool
- (
- int toolid,
- const wxBitmap& bitmap,
- const wxBitmap& pushedBitmap,
- bool toggle,
- wxObject *clientData = NULL,
- const wxString& shortHelpString = wxEmptyString,
- const wxString& longHelpString = wxEmptyString
- )
- {
- return wxToolBarSimple::AddTool(toolid, bitmap, pushedBitmap, toggle, wxDefaultCoord, wxDefaultCoord, clientData,
- shortHelpString, longHelpString);
- }
-
- // virtual overridden
- virtual wxToolBarToolBase *AddTool
- (
- int toolid,
- const wxBitmap& bitmap,
- const wxBitmap& pushedBitmap,
- bool toggle,
- wxCoord xPos,
- wxCoord yPos = wxDefaultCoord,
- wxObject *clientData = NULL,
- const wxString& shortHelpString = wxEmptyString,
- const wxString& longHelpString = wxEmptyString
- )
- {
- return wxToolBarSimple::AddTool(toolid, bitmap, pushedBitmap, toggle, xPos, yPos, clientData,
- shortHelpString, longHelpString);
- }
-
- private:
- DECLARE_DYNAMIC_CLASS(wxToolBar)
- };
- #else // wxUSE_TOOLBAR_NATIVE
- #if defined(__WXUNIVERSAL__)
- #include "wx/univ/toolbar.h"
- #elif defined(__WXMSW__) && (!defined(_WIN32_WCE) || (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__)))
- #include "wx/msw/tbar95.h"
- #elif defined(__WXWINCE__)
- #include "wx/msw/wince/tbarwce.h"
- #elif defined(__WXMSW__)
- #include "wx/msw/tbarmsw.h"
- #elif defined(__WXMOTIF__)
- #include "wx/motif/toolbar.h"
- #elif defined(__WXGTK__)
- #include "wx/gtk/tbargtk.h"
- #elif defined(__WXMAC__)
- #include "wx/mac/toolbar.h"
- #elif defined(__WXCOCOA__)
- #include "wx/cocoa/toolbar.h"
- #elif defined(__WXPM__)
- #include "wx/os2/toolbar.h"
- #endif
- #endif // !wxUSE_TOOLBAR_NATIVE/wxUSE_TOOLBAR_NATIVE
+ #if defined(__WXUNIVERSAL__)
+ #include "wx/univ/toolbar.h"
+ #elif defined(__WXPALMOS__)
+ #include "wx/palmos/toolbar.h"
+ #elif defined(__WXMSW__) && (!defined(_WIN32_WCE) || (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__)))
+ #include "wx/msw/tbar95.h"
+ #elif defined(__WXWINCE__)
+ #include "wx/msw/wince/tbarwce.h"
+ #elif defined(__WXMSW__)
+ #include "wx/msw/tbarmsw.h"
+ #elif defined(__WXMOTIF__)
+ #include "wx/motif/toolbar.h"
+ #elif defined(__WXGTK__)
+ #include "wx/gtk/tbargtk.h"
+ #elif defined(__WXMAC__)
+ #include "wx/mac/toolbar.h"
+ #elif defined(__WXCOCOA__)
+ #include "wx/cocoa/toolbar.h"
+ #elif defined(__WXPM__)
+ #include "wx/os2/toolbar.h"
+ #endif