Augmented version to b5

[wxWidgets.git] / include / wx / tbarbase.h

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 3cf75abf8ba9061202c6a8c6ba021fb3d44606d0..97ff12eafb07377ca84904341def2dac0ed9b959 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -23,7 +23,7 @@
 #include "wx/list.h"
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
 WXDLLEXPORT_DATA(extern const wxSize) wxDefaultSize;
 WXDLLEXPORT_DATA(extern const wxPoint) wxDefaultPosition;
 
@@ -158,7 +158,7 @@ class WXDLLEXPORT wxToolBarBase : public wxControl
 #endif
 
   // Lay the tools out
-  virtual void Layout(void);
+  virtual void LayoutTools();
   
   // Add all the buttons: required for Win95.
   virtual bool CreateTools(void) { return TRUE; }
@@ -208,11 +208,6 @@ class WXDLLEXPORT wxToolBarBase : public wxControl
   void OnSize(wxSizeEvent& event);
   void OnIdle(wxIdleEvent& event);
 
-  // Required to force normal cursor-setting behaviour in Windows
-#ifdef __WXMSW__
-  virtual void MSWOnMouseMove(int x, int y, WXUINT flags);
-#endif
-
  protected:
   wxList                m_tools;
 //  int                   m_tilingDirection;