Patch #826420, and also adapted to new SWIG

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

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 5992b118179b368dd95805f5b1203804dc179d34..30396a4b077500dc01bca1c422cb3e1b1e35de5a 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "tbarbase.h"
 #endif
 
     #pragma interface "tbarbase.h"
 #endif
 


@@ -506,17 +506,6 @@ public:
     // more deprecated functions
     // -------------------------
 
     // more deprecated functions
     // -------------------------
 

-#if WXWIN_COMPATIBILITY
-    void SetDefaultSize(int w, int h) { SetDefaultSize(wxSize(w, h)); }
-    long GetDefaultWidth() const { return m_defaultWidth; }
-    long GetDefaultHeight() const { return m_defaultHeight; }
-    int GetDefaultButtonWidth() const { return (int) GetDefaultButtonSize().x; };
-    int GetDefaultButtonHeight() const { return (int) GetDefaultButtonSize().y; };
-    virtual void SetDefaultSize(const wxSize& size) { SetToolBitmapSize(size); }
-    virtual wxSize GetDefaultSize() const { return GetToolBitmapSize(); }
-    virtual wxSize GetDefaultButtonSize() const { return GetToolSize(); }
-#endif // WXWIN_COMPATIBILITY
-

     // use GetToolMargins() instead
     wxSize GetMargins() const { return GetToolMargins(); }
 
     // use GetToolMargins() instead
     wxSize GetMargins() const { return GetToolMargins(); }
 


@@ -586,6 +575,9 @@ protected:
     // find the tool by id
     wxToolBarToolBase *FindById(int toolid) const;
 
     // find the tool by id
     wxToolBarToolBase *FindById(int toolid) const;
 

+    // un-toggle all buttons in the same radio group
+    void UnToggleRadioGroup(wxToolBarToolBase *tool);
+

     // the list of all our tools
     wxToolBarToolsList m_tools;
 
     // the list of all our tools
     wxToolBarToolsList m_tools;