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 404e21f0fc9ff7d897d9ea6bf1c3e1d9a0941316..3a20875d47176cee3678274c0e8ef568c74c99fb 100644 (file)
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -16,7 +16,7 @@
 #pragma interface "tbar95.h"
 #endif
 
 #pragma interface "tbar95.h"
 #endif
 

-#if USE_BUTTONBAR && USE_TOOLBAR
+#if wxUSE_BUTTONBAR && wxUSE_TOOLBAR

 #include "wx/tbarbase.h"
 
 WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
 #include "wx/tbarbase.h"
 
 WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;


@@ -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,11 @@ 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;

 
   // Add all the buttons: required for Win95.
   virtual bool CreateTools(void);
 
   // Add all the buttons: required for Win95.
   virtual bool CreateTools(void);


@@ -79,8 +83,8 @@ class WXDLLEXPORT wxToolBar95: public wxToolBarBase
   bool Realize() { return CreateTools(); };
 
   // IMPLEMENTATION
   bool Realize() { return CreateTools(); };
 
   // IMPLEMENTATION

-  bool MSWCommand(WXUINT param, WXWORD id);
-  bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam);
+  virtual bool MSWCommand(WXUINT param, WXWORD id);
+  virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result);

 
   // Responds to colour changes
   void OnSysColourChanged(wxSysColourChangedEvent& event);
 
   // Responds to colour changes
   void OnSysColourChanged(wxSysColourChangedEvent& event);


@@ -91,6 +95,6 @@ protected:
 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };
 

-#endif // USE_TOOL/BUTTONBAR
+#endif // wxUSE_TOOL/BUTTONBAR

 #endif
     // _WX_TBAR95_H_
 #endif
     // _WX_TBAR95_H_