X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef7eaedd63ffc4d6ab9a0fe5e3c91c49c14ffa11..9d8c2f419f522408a922277df330d4c4511befb9:/include/wx/tbarbase.h

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index f02093fd06..81062fe304 100644
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -236,7 +236,7 @@ public:
     // between the two states.
     wxToolBarToolBase *AddTool(int id,
                                const wxBitmap& bitmap,
-                               const wxBitmap& pushedBitmap = wxNullBitmap,
+                               const wxBitmap& pushedBitmap,
                                bool toggle = FALSE,
                                wxObject *clientData = NULL,
                                const wxString& shortHelpString = wxEmptyString,
@@ -335,12 +335,12 @@ public:
     virtual void SetToolSeparation(int separation)
         { m_toolSeparation = separation; }
 
-    virtual wxSize GetToolMargins() { return wxSize(m_xMargin, m_yMargin); }
+    virtual wxSize GetToolMargins() { return GetToolMargins(); }
     virtual int GetToolPacking() { return m_toolPacking; }
     virtual int GetToolSeparation() { return m_toolSeparation; }
 
     // for compatibility
-    wxSize GetMargins() const { return GetToolMargins(); }
+    wxSize GetMargins() const { return wxSize(m_xMargin, m_yMargin); }
 
     // toolbar geometry
     // ----------------
@@ -411,7 +411,7 @@ public:
     virtual void DoToolbarUpdates();
 
     // Don't want toolbars to accept the focus
-    bool AcceptsFocus() const { return FALSE; }
+    virtual bool AcceptsFocus() const { return FALSE; }
 
 protected:
     // to implement in derived classes