X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/89b892a2982c7f3bb67837835c2701bd70cdd2bc..26128999a7e2bc05024e09ba2658d4a6ab87accd:/src/msw/tbar95.cpp

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 5466c564ef..2cf8e00d61 100644
--- 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"
@@ -75,12 +77,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar95, wxToolBarBase)
 #endif
 
 BEGIN_EVENT_TABLE(wxToolBar95, wxToolBarBase)
-#if 0 // it seems like none of these functions does anything anyhow
     EVT_SIZE(wxToolBar95::OnSize)
     EVT_PAINT(wxToolBar95::OnPaint)
-    EVT_KILL_FOCUS(wxToolBar95::OnKillFocus)
     EVT_MOUSE_EVENTS(wxToolBar95::OnMouseEvent)
-#endif // 0
+    EVT_KILL_FOCUS(wxToolBar95::OnKillFocus)
     EVT_SYS_COLOUR_CHANGED(wxToolBar95::OnSysColourChanged)
 END_EVENT_TABLE()
 
@@ -151,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
@@ -374,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]));
@@ -424,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
@@ -490,7 +503,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;
@@ -513,6 +526,20 @@ void wxToolBar95::OnSysColourChanged(wxSysColourChangedEvent& event)
     wxWindow::OnSysColourChanged(event);
 }
 
+void wxToolBar95::OnMouseEvent(wxMouseEvent& event)
+{
+    if (event.RightDown())
+    {
+        // For now, we don't have an id. Later we could
+        // try finding the tool.
+        OnRightClick((int)-1, event.GetX(), event.GetY());
+    }
+    else
+    {
+        Default();
+    }
+}
+
 // These are the default colors used to map the bitmap colors
 // to the current system colors