Removed floor() references

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

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index fb02e9d4b8b79248c4754e6145e02f5ab6bc6964..fc78112d5c9aaa0aadaace719286edd06a3e6a20 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -77,10 +77,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar95, wxToolBarBase)
 #endif
 
 BEGIN_EVENT_TABLE(wxToolBar95, wxToolBarBase)
-    EVT_SIZE(wxToolBar95::OnSize)
-    EVT_PAINT(wxToolBar95::OnPaint)
     EVT_MOUSE_EVENTS(wxToolBar95::OnMouseEvent)
-    EVT_KILL_FOCUS(wxToolBar95::OnKillFocus)
     EVT_SYS_COLOUR_CHANGED(wxToolBar95::OnSysColourChanged)
 END_EVENT_TABLE()
 
@@ -440,15 +437,6 @@ wxSize wxToolBar95::GetMaxSize() const
   return wxSize(m_maxWidth, m_maxHeight);
 }
 
-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!
-  // Taking this fudge factor out now, it seems fine without it.
-//  *h -= 2;
-}
-
 // The button size is bigger than the bitmap size
 wxSize wxToolBar95::GetToolSize() const
 {
@@ -527,8 +515,6 @@ void wxToolBar95::OnSysColourChanged(wxSysColourChangedEvent& event)
     // Remap the buttons
     CreateTools();
 
-    Default();
-
     Refresh();
 
     // Propagate the event to the non-top-level children
@@ -545,7 +531,7 @@ void wxToolBar95::OnMouseEvent(wxMouseEvent& event)
     }
     else
     {
-        Default();
+        event.Skip();
     }
 }