New scrolling code.

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

diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index dcc678db06c28b38a7a6c788f0c0697ea2cee2c4..14e5eb14c528674674a0abd72cd9fbbe4f6eeca9 100644 (file)
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TBAR95_H_
@@ -16,7 +16,7 @@
 #pragma interface "tbar95.h"
 #endif
 
-#if wxUSE_BUTTONBAR && wxUSE_TOOLBAR
+#if wxUSE_TOOLBAR
 #include "wx/tbarbase.h"
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
@@ -66,8 +66,6 @@ class WXDLLEXPORT wxToolBar95: public wxToolBarBase
 
   wxSize GetMaxSize() const;
 
-  void GetSize(int *w, int *y) const;
-
   virtual bool GetToolState(int toolIndex) const;
 
   // Add all the buttons: required for Win95.
@@ -91,6 +89,7 @@ protected:
 DECLARE_EVENT_TABLE()
 };
 
-#endif // wxUSE_TOOL/BUTTONBAR
+#endif // wxUSE_TOOLBAR
+
 #endif
     // _WX_TBAR95_H_