X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34e5028ffe505210052ff66a453587b2720b078d..d21d2e5adf7a5acf3b496a9c4e87eab220bd75d8:/src/msw/tbar95.cpp

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 470d5e5cfa..40119dce3b 100644
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -218,14 +218,17 @@ bool wxToolBar::Create(wxWindow *parent,
                        long style,
                        const wxString& name)
 {
+    // toolbars never have border, giving one to them results in broken
+    // appearance
+    style &= ~wxBORDER_MASK;
+    style |= wxBORDER_NONE;
+
     // common initialisation
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
         return FALSE;
 
     // prepare flags
     DWORD msflags = 0;      // WS_VISIBLE | WS_CHILD always included
-    if (style & wxBORDER)
-        msflags |= WS_BORDER;
 
    if ( style & wxCLIP_SIBLINGS )
         msflags |= WS_CLIPSIBLINGS;
@@ -833,8 +836,9 @@ bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),
             //     this case
 
             size_t lenAnsi = help.Len();
-            #ifdef __MWERKS__
+            #if defined( __MWERKS__ ) || defined( __CYGWIN__ )
                 // MetroWerks doesn't like calling mbstowcs with NULL argument
+                // neither Cygwin does
                 size_t lenUnicode = 2*lenAnsi;
             #else
                 size_t lenUnicode = mbstowcs(NULL, help, lenAnsi);