X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e711d5c093dcc758e3f1670caf845612ea9fa92..a4301b8f14d21b7d28fc4f6a247b740d945ca6dc:/include/wx/toolbar.h diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h index e7872223aa..3a495576dc 100644 --- a/include/wx/toolbar.h +++ b/include/wx/toolbar.h @@ -5,52 +5,88 @@ // Modified by: // Created: 20.11.99 // RCS-ID: $Id$ -// Copyright: (c) wxWindows team +// Copyright: (c) Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_TOOLBAR_H_BASE_ #define _WX_TOOLBAR_H_BASE_ -#include "wx/tbarbase.h" // the base class for all toolbars +#include "wx/defs.h" + +// ---------------------------------------------------------------------------- +// wxToolBar style flags +// ---------------------------------------------------------------------------- + +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, + + // "flat" buttons (Win32/GTK only) + wxTB_FLAT = 0x0020, + + // dockable toolbar (GTK only) + wxTB_DOCKABLE = 0x0040, + + // don't show the icons (they're shown by default) + wxTB_NOICONS = 0x0080, + + // show the text (not shown by default) + wxTB_TEXT = 0x0100, + + // don't show the divider between toolbar and the window (Win32 only) + wxTB_NODIVIDER = 0x0200, + + // no automatic alignment (Win32 only, useless) + wxTB_NOALIGN = 0x0400, + + // show the text and the icons alongside, not vertically stacked (Win32/GTK) + wxTB_HORZ_LAYOUT = 0x0800, + 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, + + wxTB_DEFAULT_STYLE = wxTB_HORIZONTAL | wxTB_FLAT +}; #if wxUSE_TOOLBAR - #if !wxUSE_TOOLBAR_NATIVE || defined(__WXUNIVERSAL__) - #include "wx/tbarsmpl.h" - - class WXDLLEXPORT wxToolBar : public wxToolBarSimple - { - public: - wxToolBar() { } - - wxToolBar(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxNO_BORDER | wxTB_HORIZONTAL, - const wxString& name = wxToolBarNameStr) - : wxToolBarSimple(parent, id, pos, size, style, name) { } - - private: - DECLARE_DYNAMIC_CLASS(wxToolBar) - }; - #else // wxUSE_TOOLBAR_NATIVE - #if 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" - #elif defined(__WXSTUBS__) - #include "wx/stubs/toolbar.h" - #endif - #endif // !wxUSE_TOOLBAR_NATIVE/wxUSE_TOOLBAR_NATIVE + #include "wx/tbarbase.h" // the base class for all toolbars + + #if defined(__WXUNIVERSAL__) + #include "wx/univ/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