wxZipFSHandler does not report non-local zip archives as openable anymore

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

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index f02093fd0676dc8aea595eaef872cacdcc9b2454..cf7eeac27cb6c91257fb913dd60603d3295edbb7 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -335,12 +335,12 @@ public:
     virtual void SetToolSeparation(int separation)
         { m_toolSeparation = separation; }
 
     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
     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
     // ----------------
 
     // toolbar geometry
     // ----------------