Added wxTE_PROCESS_TAB

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

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index e68cb480f83045ec8cfdae6e7647b77cdc2f7f3f..83347ece08366ff01422d6d24f15a56f6876415e 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -21,7 +21,7 @@
 #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__)


@@ -75,7 +75,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar95, wxToolBarBase)
 #endif
 
 BEGIN_EVENT_TABLE(wxToolBar95, wxToolBarBase)
 #endif
 
 BEGIN_EVENT_TABLE(wxToolBar95, wxToolBarBase)

+    EVT_SIZE(wxToolBar95::OnSize)
+    EVT_PAINT(wxToolBar95::OnPaint)

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

+    EVT_KILL_FOCUS(wxToolBar95::OnKillFocus)

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


@@ -485,7 +488,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;