Use wxUSE_* flags for new animation code.

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

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 44f022092bc0b5807fcaed86ccb93b6ee187ba80..8eb5f22af431d9643dfc4b7c1cbeaf8ccb2e215d 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -32,7 +32,7 @@ class WXDLLEXPORT wxImage;
 // constants
 // ----------------------------------------------------------------------------
 
 // constants
 // ----------------------------------------------------------------------------
 

-extern WXDLLEXPORT_DATA(const wxChar*) wxToolBarNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[];

 extern WXDLLEXPORT_DATA(const wxSize) wxDefaultSize;
 extern WXDLLEXPORT_DATA(const wxPoint) wxDefaultPosition;
 
 extern WXDLLEXPORT_DATA(const wxSize) wxDefaultSize;
 extern WXDLLEXPORT_DATA(const wxPoint) wxDefaultPosition;
 


@@ -105,7 +105,7 @@ public:
         m_toolStyle = wxTOOL_STYLE_CONTROL;
     }
 
         m_toolStyle = wxTOOL_STYLE_CONTROL;
     }
 

-    ~wxToolBarToolBase(){}
+    virtual ~wxToolBarToolBase(){}

 
     // accessors
     // ---------
 
     // accessors
     // ---------