X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc26eeb36a7415bd73d3e442c79b7acc0aeed6eb..8084f8b7c6dd538fce55d2542e9b2e70bc69f760:/include/wx/radiobox.h diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h index 540e4945c3..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,17 +84,11 @@ public: } - // deprecated functions - // -------------------- - -#if WXWIN_COMPATIBILITY_2_4 - wxDEPRECATED( int GetNumberOfRowsOrCols() const ); - wxDEPRECATED( void SetNumberOfRowsOrCols(int n) ); -#endif // WXWIN_COMPATIBILITY_2_4 - protected: wxRadioBoxBase() { + m_numCols = + m_numRows = m_majorDim = 0; #if wxUSE_TOOLTIPS @@ -102,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; }