previous commit removed WXDLLIMPEXP_HTML by mistake

[wxWidgets.git] / include / wx / toolbar.h

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index 81ca04152df0ea121abad33b3c57953415bcbecc..11878e4760623880a93bf47f26ee8f3c30f07300 100644 (file)
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -12,9 +12,49 @@
 #ifndef _WX_TOOLBAR_H_BASE_
 #define _WX_TOOLBAR_H_BASE_
 
 #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
+
+    // lay out the toolbar vertically
+    wxTB_VERTICAL    = wxVERTICAL,      // == 0x0008
+
+    // 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
+};

 
 #if wxUSE_TOOLBAR
 
 #if wxUSE_TOOLBAR

+    #include "wx/tbarbase.h"     // the base class for all toolbars
+

     #if !wxUSE_TOOLBAR_NATIVE && !defined(__WXUNIVERSAL__)
         #include "wx/tbarsmpl.h"
 
     #if !wxUSE_TOOLBAR_NATIVE && !defined(__WXUNIVERSAL__)
         #include "wx/tbarsmpl.h"
 


@@ -24,27 +64,27 @@
             wxToolBar() { }
 
             wxToolBar(wxWindow *parent,
             wxToolBar() { }
 
             wxToolBar(wxWindow *parent,

-                      wxWindowID id,
+                      wxWindowID winid,

                       const wxPoint& pos = wxDefaultPosition,
                       const wxSize& size = wxDefaultSize,
                       long style = wxNO_BORDER | wxTB_HORIZONTAL,
                       const wxString& name = wxToolBarNameStr)
                       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) { }
+                : wxToolBarSimple(parent, winid, pos, size, style, name) { }

 
             // the most commonly used version of AddTool()
 
             // the most commonly used version of AddTool()

-            wxToolBarToolBase *AddTool(int id,
+            wxToolBarToolBase *AddTool(int toolid,

                                const wxBitmap& bitmap,
                                const wxString& shortHelpString = wxEmptyString,
                                const wxString& longHelpString = wxEmptyString)
             {
                                const wxBitmap& bitmap,
                                const wxString& shortHelpString = wxEmptyString,
                                const wxString& longHelpString = wxEmptyString)
             {

-                return wxToolBarSimple::AddTool(id, bitmap, wxNullBitmap, FALSE, -1, -1, NULL,
+                return wxToolBarSimple::AddTool(toolid, bitmap, wxNullBitmap, FALSE, -1, -1, NULL,

                        shortHelpString, longHelpString);
             }
 
             // old form
             wxToolBarToolBase *AddTool
                                (
                        shortHelpString, longHelpString);
             }
 
             // old form
             wxToolBarToolBase *AddTool
                                (

-                                   int id,
+                                   int toolid,

                                    const wxBitmap& bitmap,
                                    const wxBitmap& pushedBitmap,
                                    bool toggle,
                                    const wxBitmap& bitmap,
                                    const wxBitmap& pushedBitmap,
                                    bool toggle,


@@ -53,14 +93,14 @@
                                    const wxString& longHelpString = wxEmptyString
                                )
             {
                                    const wxString& longHelpString = wxEmptyString
                                )
             {

-                return wxToolBarSimple::AddTool(id, bitmap, pushedBitmap, toggle, -1, -1, clientData,
+                return wxToolBarSimple::AddTool(toolid, bitmap, pushedBitmap, toggle, -1, -1, clientData,

                        shortHelpString, longHelpString);
             }
 
             // virtual overridden
             virtual wxToolBarToolBase *AddTool
                                (
                        shortHelpString, longHelpString);
             }
 
             // virtual overridden
             virtual wxToolBarToolBase *AddTool
                                (

-                                   int id,
+                                   int toolid,

                                    const wxBitmap& bitmap,
                                    const wxBitmap& pushedBitmap,
                                    bool toggle,
                                    const wxBitmap& bitmap,
                                    const wxBitmap& pushedBitmap,
                                    bool toggle,


@@ -71,7 +111,7 @@
                                    const wxString& longHelpString = wxEmptyString
                                )
             {
                                    const wxString& longHelpString = wxEmptyString
                                )
             {

-                return wxToolBarSimple::AddTool(id, bitmap, pushedBitmap, toggle, xPos, yPos, clientData,
+                return wxToolBarSimple::AddTool(toolid, bitmap, pushedBitmap, toggle, xPos, yPos, clientData,

                        shortHelpString, longHelpString);
             }
 
                        shortHelpString, longHelpString);
             }
 


@@ -93,8 +133,6 @@
            #include "wx/mac/toolbar.h"
         #elif defined(__WXPM__)
            #include "wx/os2/toolbar.h"
            #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
 #endif // wxUSE_TOOLBAR
         #endif
     #endif // !wxUSE_TOOLBAR_NATIVE/wxUSE_TOOLBAR_NATIVE
 #endif // wxUSE_TOOLBAR