X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ce43bfae9c8245d620c9bd7cca50b8fa9d88e38..c9ccc09c64f4c29d4667796bef7b507d9e8d25ed:/include/wx/toolbar.h?ds=sidebyside diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h index 4e1a581f47..60b3ce10d7 100644 --- a/include/wx/toolbar.h +++ b/include/wx/toolbar.h @@ -5,7 +5,7 @@ // Modified by: // Created: 20.11.99 // RCS-ID: $Id$ -// Copyright: (c) wxWindows team +// Copyright: (c) Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -22,9 +22,11 @@ enum { // lay out the toolbar horizontally wxTB_HORIZONTAL = wxHORIZONTAL, // == 0x0004 + wxTB_TOP = wxTB_HORIZONTAL, // lay out the toolbar vertically wxTB_VERTICAL = wxVERTICAL, // == 0x0008 + wxTB_LEFT = wxTB_VERTICAL, // show 3D buttons (wxToolBarSimple only) wxTB_3DBUTTONS = 0x0010, @@ -49,96 +51,42 @@ enum // show the text and the icons alongside, not vertically stacked (Win32/GTK) wxTB_HORZ_LAYOUT = 0x0800, - wxTB_HORZ_TEXT = wxTB_HORZ_LAYOUT | wxTB_TEXT + wxTB_HORZ_TEXT = wxTB_HORZ_LAYOUT | wxTB_TEXT, + + // don't show the toolbar short help tooltips + wxTB_NO_TOOLTIPS = 0x1000, + + // lay out toolbar at the bottom of the window + wxTB_BOTTOM = 0x2000, + + // lay out toolbar at the right edge of the window + wxTB_RIGHT = 0x4000 }; #if wxUSE_TOOLBAR #include "wx/tbarbase.h" // the base class for all toolbars - // 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, -1, -1, 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, -1, -1, clientData, - shortHelpString, longHelpString); - } - - // virtual overridden - virtual wxToolBarToolBase *AddTool - ( - int toolid, - const wxBitmap& bitmap, - const wxBitmap& pushedBitmap, - bool toggle, - wxCoord xPos, - wxCoord yPos = -1, - 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(__WXWINCE__) - #include "wx/msw/wince/tbarwce.h" - #elif defined(__WXMSW__) && defined(__WIN95__) - #include "wx/msw/tbar95.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(__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/toolbar.h" + #elif defined(__WXWINCE__) + #include "wx/msw/wince/tbarwce.h" + #elif defined(__WXMOTIF__) + #include "wx/motif/toolbar.h" + #elif defined(__WXGTK20__) + #include "wx/gtk/toolbar.h" + #elif defined(__WXGTK__) + #include "wx/gtk1/toolbar.h" + #elif defined(__WXMAC__) + #include "wx/osx/toolbar.h" + #elif defined(__WXCOCOA__) + #include "wx/cocoa/toolbar.h" + #elif defined(__WXPM__) + #include "wx/os2/toolbar.h" + #endif #endif // wxUSE_TOOLBAR #endif