Added GetRect to region iterator; cured window.cpp problem for BC++

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

diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index 404e21f0fc9ff7d897d9ea6bf1c3e1d9a0941316..6bbcc4a01961d89e4fa08a3be9173ffb68ddd088 100644 (file)
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -16,7 +16,7 @@
 #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;
@@ -70,6 +70,8 @@ class WXDLLEXPORT wxToolBar95: public wxToolBarBase
   wxSize GetMaxSize(void) const;
   void GetSize(int *w, int *y) const;
 
+  virtual bool GetToolState(int toolIndex) const;
+
   // Add all the buttons: required for Win95.
   virtual bool CreateTools(void);
   virtual void SetRows(int nRows);
@@ -91,6 +93,6 @@ protected:
 DECLARE_EVENT_TABLE()
 };
 
-#endif // USE_TOOL/BUTTONBAR
+#endif // wxUSE_TOOL/BUTTONBAR
 #endif
     // _WX_TBAR95_H_