Fixed wxMotif's wxExecute again, added OnPaint capability to wxFrame,

[wxWidgets.git] / src / msw / tbar95.cpp

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 5e8e5dab765008b871d71e0d8b066192a126f876..5f26caa4135d376db5bcc6a76bb5234c8d5a2722 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -21,24 +21,26 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx.h"
+#include "wx/wx.h"
 #endif
 
 #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"
@@ -372,8 +374,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]));
@@ -488,7 +494,7 @@ wxToolBarTool *wxToolBar95::AddTool(int index, const wxBitmap& bitmap, const wxB
   else
     tool->m_y = m_yMargin;
 
-  tool->SetSize(GetDefaultButtonWidth(), GetDefaultButtonHeight());
+  tool->SetSize(GetToolSize().x, GetToolSize().y);
 
   m_tools.Append((long)index, tool);
   return tool;