X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/155e46c2edbfb4d65cbd207a725d2009d40803de..dd9f8b6bb6935360a8271dc3e8749fb026b601a8:/include/wx/radiobox.h?ds=sidebyside

diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index 070cc9f95b..de331d09dc 100644
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -20,13 +20,13 @@
 
 #include "wx/dynarray.h"
 
-class WXDLLEXPORT wxToolTip;
+class WXDLLIMPEXP_FWD_CORE wxToolTip;
 
 WX_DEFINE_EXPORTED_ARRAY_PTR(wxToolTip *, wxToolTipArray);
 
 #endif // wxUSE_TOOLTIPS
 
-extern WXDLLEXPORT_DATA(const wxChar) wxRadioBoxNameStr[];
+extern WXDLLEXPORT_DATA(const char) wxRadioBoxNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxRadioBoxBase is not a normal base class, but rather a mix-in because the
@@ -84,14 +84,6 @@ public:
     }
 
 
-    // deprecated functions
-    // --------------------
-
-#if WXWIN_COMPATIBILITY_2_4
-    wxDEPRECATED( int GetNumberOfRowsOrCols() const );
-    wxDEPRECATED( void SetNumberOfRowsOrCols(int n) );
-#endif // WXWIN_COMPATIBILITY_2_4
-
 protected:
     wxRadioBoxBase()
     {
@@ -104,6 +96,8 @@ protected:
 #endif // wxUSE_TOOLTIPS
     }
 
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
     // return the number of items in major direction (which depends on whether
     // we have wxRA_SPECIFY_COLS or wxRA_SPECIFY_ROWS style)
     unsigned int GetMajorDim() const { return m_majorDim; }