X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b15579781935495ff2a126b4ffac81f2cb51b99d..befa206be99ab50519f3e4c8fdba5e6d8306f3fe:/interface/wx/toolbar.h?ds=sidebyside

diff --git a/interface/wx/toolbar.h b/interface/wx/toolbar.h
index 6be9353b2e..a7ccb783a7 100644
--- a/interface/wx/toolbar.h
+++ b/interface/wx/toolbar.h
@@ -36,12 +36,12 @@
     bitmaps will inadvertently be mapped to system colours.
     To do this, set the msw.remap system option before creating the toolbar:
     @code
-    wxSystemOptions::SetOption(wxT("msw.remap"), 0);
+    wxSystemOptions::SetOption("msw.remap", 0);
     @endcode
     If you wish to use 32-bit images (which include an alpha channel for
     transparency) use:
     @code
-    wxSystemOptions::SetOption(wxT("msw.remap"), 2);
+    wxSystemOptions::SetOption("msw.remap", 2);
     @endcode
     Then colour remapping is switched off, and a transparent background
     used. But only use this option under Windows XP with true colour:
@@ -160,7 +160,7 @@ public:
     wxToolBar(wxWindow* parent, wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
-              long style = wxTB_HORIZONTAL | wxBORDER_NONE,
+              long style = wxTB_HORIZONTAL,
               const wxString& name = wxToolBarNameStr);
 
     /**
@@ -231,6 +231,7 @@ public:
     */
     virtual wxToolBarToolBase* AddSeparator();
 
+    //@{
     /**
         Adds a tool to the toolbar.
 
@@ -323,6 +324,7 @@ public:
                                const wxString& shortHelpString = wxEmptyString,
                                const wxString& longHelpString = wxEmptyString,
                                wxObject* clientData = NULL);
+    //@}
 
     /**
         Deletes all the tools in the toolbar.
@@ -529,8 +531,8 @@ public:
                                   const wxBitmap& bitmap2 = wxNullBitmap,
                                   bool isToggle = false,
                                   wxObject* clientData = NULL,
-                                  const wxString& shortHelpString = "",
-                                  const wxString& longHelpString = "");
+                                  const wxString& shortHelpString = wxEmptyString,
+                                  const wxString& longHelpString = wxEmptyString);
     wxToolBarToolBase* InsertTool(size_t pos,
                                   wxToolBarToolBase* tool);
     //@}
@@ -627,6 +629,7 @@ public:
     */
     bool SetDropdownMenu(int id, wxMenu* menu);
 
+    //@{
     /**
         Set the values to be used as margins for the toolbar.
 
@@ -656,6 +659,7 @@ public:
         @see GetMargins(), wxSize
     */
     void SetMargins(const wxSize& size);
+    //@}
 
     /**
         Sets the default size of each tool bitmap. The default bitmap size is 16