Corrections to Forty Thieves; wxMemoryDC problem temporarily sorted

[wxWidgets.git] / include / wx / msw / tbar95.h

diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index 4aae20d62a95996b560705480e8ea5f13fd55b13..3a20875d47176cee3678274c0e8ef568c74c99fb 100644 (file)
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -46,8 +46,8 @@ class WXDLLEXPORT wxToolBar95: public wxToolBarBase
   // Call default behaviour
   void OnPaint(wxPaintEvent& event) { Default() ; }
   void OnSize(wxSizeEvent& event) { Default() ; }
   // Call default behaviour
   void OnPaint(wxPaintEvent& event) { Default() ; }
   void OnSize(wxSizeEvent& event) { Default() ; }

-  void OnMouseEvent(wxMouseEvent& event) { Default() ; }

   void OnKillFocus(wxFocusEvent& event) { Default() ; }
   void OnKillFocus(wxFocusEvent& event) { Default() ; }

+  void OnMouseEvent(wxMouseEvent& event);

 
   // Handle wxToolBar95 events
 
 
   // Handle wxToolBar95 events
 


@@ -68,7 +68,9 @@ class WXDLLEXPORT wxToolBar95: public wxToolBarBase
   wxSize GetToolSize(void) const;
 
   wxSize GetMaxSize(void) const;
   wxSize GetToolSize(void) const;
 
   wxSize GetMaxSize(void) const;

+

   void GetSize(int *w, int *y) const;
   void GetSize(int *w, int *y) const;

+  wxSize GetSize() const { return wxWindow::GetSize(); }

 
   virtual bool GetToolState(int toolIndex) const;
 
 
   virtual bool GetToolState(int toolIndex) const;