added forward declaration of FrameSite apparently needed by mingw32 4.3

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

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 4246032a5b3a91308fd66a776a2a1d5b9d03a089..b0be7b0e7b569766eb08b72de7c6f3fa2684477e 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -171,16 +171,16 @@ public:
     }
 
     // modifiers: return true if the state really changed
     }
 
     // modifiers: return true if the state really changed

-    bool Enable(bool enable);
-    bool Toggle(bool toggle);
-    bool SetToggle(bool toggle);
-    bool SetShortHelp(const wxString& help);
-    bool SetLongHelp(const wxString& help);
+    virtual bool Enable(bool enable);
+    virtual bool Toggle(bool toggle);
+    virtual bool SetToggle(bool toggle);
+    virtual bool SetShortHelp(const wxString& help);
+    virtual bool SetLongHelp(const wxString& help);

 
     void Toggle() { Toggle(!IsToggled()); }
 
 
     void Toggle() { Toggle(!IsToggled()); }
 

-    void SetNormalBitmap(const wxBitmap& bmp) { m_bmpNormal = bmp; }
-    void SetDisabledBitmap(const wxBitmap& bmp) { m_bmpDisabled = bmp; }
+    virtual void SetNormalBitmap(const wxBitmap& bmp) { m_bmpNormal = bmp; }
+    virtual void SetDisabledBitmap(const wxBitmap& bmp) { m_bmpDisabled = bmp; }

 
     virtual void SetLabel(const wxString& label) { m_label = label; }
 
 
     virtual void SetLabel(const wxString& label) { m_label = label; }
 


@@ -202,7 +202,7 @@ public:
 
     // these methods are only for tools of wxITEM_DROPDOWN kind (but even such
     // tools can have a NULL associated menu)
 
     // these methods are only for tools of wxITEM_DROPDOWN kind (but even such
     // tools can have a NULL associated menu)

-    void SetDropdownMenu(wxMenu *menu);
+    virtual void SetDropdownMenu(wxMenu *menu);

     wxMenu *GetDropdownMenu() const { return m_dropdownMenu; }
 
 protected:
     wxMenu *GetDropdownMenu() const { return m_dropdownMenu; }
 
 protected: