X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2432b92dd7a837db13d3938a56c1959decd03203..8162b8489765fbc579b9f60f229265ca1bfd8ab0:/src/msw/tbar95.cpp?ds=sidebyside

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 83347ece08..2cf8e00d61 100644
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -26,19 +26,21 @@
 
 #if wxUSE_BUTTONBAR && wxUSE_TOOLBAR && defined(__WIN95__)
 
-#ifndef __GNUWIN32__
+#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)
 #include "malloc.h"
 #endif
 
 #include <windows.h>
 
-#ifndef __GNUWIN32__
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
 #include <commctrl.h>
 #endif
 
+#ifndef __TWIN32__
 #ifdef __GNUWIN32__
 #include "wx/msw/gnuwin32/extra.h"
 #endif
+#endif
 
 #include "wx/msw/dib.h"
 #include "wx/tbar95.h"
@@ -149,10 +151,18 @@ bool wxToolBar95::Create(wxWindow *parent,
         msflags |= TBSTYLE_FLAT;
   }
 
+  bool want3D;
+  WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
+
+  // Even with extended styles, need to combine with WS_BORDER
+  // for them to look right.
+  if ( want3D || wxStyleHasBorder(m_windowStyle) )
+      msflags |= WS_BORDER;
+
   // Create the toolbar control.
   HWND hWndToolbar = CreateWindowEx
                      (
-                      0L,                       // No extended styles.
+                      exStyle,                  // Extended styles.
                       TOOLBARCLASSNAME,         // Class name for the toolbar.
                       "",                       // No default text.
                       msflags,                  // Styles
@@ -372,8 +382,12 @@ bool wxToolBar95::MSWNotify(WXWPARAM WXUNUSED(wParam),
             // FIXME this is a temp hack only until I understand better what
             //       must be done in both ANSI and Unicode builds
             size_t lenAnsi = tool->m_shortHelpString.Len();
+            #ifdef __MWERKS__
+            wchar_t *pwz = new wchar_t[lenAnsi * 2 + 1];
+            #else
             size_t lenUnicode = mbstowcs(NULL, tool->m_shortHelpString, lenAnsi);
             wchar_t *pwz = new wchar_t[lenUnicode + 1];
+            #endif
             mbstowcs(pwz, tool->m_shortHelpString, lenAnsi + 1);
             memcpy(ttText->szText, pwz,
                    (sizeof(ttText->szText) - 1)/sizeof(ttText->szText[0]));
@@ -422,7 +436,8 @@ void wxToolBar95::GetSize(int *w, int *h) const
   wxWindow::GetSize(w, h);
   // For some reason, the returned height is several pixels bigger than that
   // displayed!
-  *h -= 2;
+  // Taking this fudge factor out now, it seems fine without it.
+//  *h -= 2;
 }
 
 // The button size is bigger than the bitmap size