Revert "Make wxMSW stack walking methods work with Unicode identifiers."

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

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index 60b3ce10d70d1160e163054020fa385ecc62c702..49a446e777facb30bba0b39068dc7f412fd3f6ab 100644 (file)
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.11.99
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.11.99

-// RCS-ID:      $Id$

 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -60,7 +59,9 @@ enum
     wxTB_BOTTOM       = 0x2000,
 
     // lay out toolbar at the right edge of the window
     wxTB_BOTTOM       = 0x2000,
 
     // lay out toolbar at the right edge of the window

-    wxTB_RIGHT        = 0x4000
+    wxTB_RIGHT        = 0x4000,
+
+    wxTB_DEFAULT_STYLE = wxTB_HORIZONTAL | wxTB_FLAT

 };
 
 #if wxUSE_TOOLBAR
 };
 
 #if wxUSE_TOOLBAR


@@ -68,8 +69,6 @@ enum
 
     #if defined(__WXUNIVERSAL__)
        #include "wx/univ/toolbar.h"
 
     #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__)
     #elif defined(__WXMSW__) && (!defined(_WIN32_WCE) || (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__)))
        #include "wx/msw/toolbar.h"
     #elif defined(__WXWINCE__)