wxEVT_COMMAND_CHOICE_SELECTED => wxEVT_COMMAND_COMBOBOX_SELECTED

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

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 5466c564ef8889846f392491c8bfb81756cdf84d..d83469d6a6f106f1c9e61795d088ad709052979f 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -21,24 +21,26 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx.h"
+#include "wx/wx.h"

 #endif
 
 #if wxUSE_BUTTONBAR && wxUSE_TOOLBAR && defined(__WIN95__)
 
 #endif
 
 #if wxUSE_BUTTONBAR && wxUSE_TOOLBAR && defined(__WIN95__)
 

-#ifndef __GNUWIN32__
+#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)

 #include "malloc.h"
 #endif
 
 #include <windows.h>
 
 #include "malloc.h"
 #endif
 
 #include <windows.h>
 

-#ifndef __GNUWIN32__
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)

 #include <commctrl.h>
 #endif
 
 #include <commctrl.h>
 #endif
 

+#ifndef __TWIN32__

 #ifdef __GNUWIN32__
 #include "wx/msw/gnuwin32/extra.h"
 #endif
 #ifdef __GNUWIN32__
 #include "wx/msw/gnuwin32/extra.h"
 #endif

+#endif

 
 #include "wx/msw/dib.h"
 #include "wx/tbar95.h"
 
 #include "wx/msw/dib.h"
 #include "wx/tbar95.h"


@@ -75,12 +77,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar95, wxToolBarBase)
 #endif
 
 BEGIN_EVENT_TABLE(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_SIZE(wxToolBar95::OnSize)
     EVT_PAINT(wxToolBar95::OnPaint)

-    EVT_KILL_FOCUS(wxToolBar95::OnKillFocus)

     EVT_MOUSE_EVENTS(wxToolBar95::OnMouseEvent)
     EVT_MOUSE_EVENTS(wxToolBar95::OnMouseEvent)

-#endif // 0
+    EVT_KILL_FOCUS(wxToolBar95::OnKillFocus)

     EVT_SYS_COLOUR_CHANGED(wxToolBar95::OnSysColourChanged)
 END_EVENT_TABLE()
 
     EVT_SYS_COLOUR_CHANGED(wxToolBar95::OnSysColourChanged)
 END_EVENT_TABLE()
 


@@ -490,7 +490,7 @@ wxToolBarTool *wxToolBar95::AddTool(int index, const wxBitmap& bitmap, const wxB
   else
     tool->m_y = m_yMargin;
 
   else
     tool->m_y = m_yMargin;
 

-  tool->SetSize(GetDefaultButtonWidth(), GetDefaultButtonHeight());
+  tool->SetSize(GetToolSize().x, GetToolSize().y);

 
   m_tools.Append((long)index, tool);
   return tool;
 
   m_tools.Append((long)index, tool);
   return tool;


@@ -513,6 +513,20 @@ void wxToolBar95::OnSysColourChanged(wxSysColourChangedEvent& event)
     wxWindow::OnSysColourChanged(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
 
 // These are the default colors used to map the bitmap colors
 // to the current system colors