don't attempt to convert 8bit values to Unicode in ANSI build

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

diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index ed60e202b886d43819eafbe6a31486a6bb5d2dfe..a91b8c5ebd8af2c0b6c05f9d9e9a35e09a3405b1 100644 (file)
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -20,7 +20,7 @@
 
 #include "wx/dynarray.h"
 
 
 #include "wx/dynarray.h"
 

-class WXDLLEXPORT wxToolTip;
+class WXDLLIMPEXP_FWD_CORE wxToolTip;

 
 WX_DEFINE_EXPORTED_ARRAY_PTR(wxToolTip *, wxToolTipArray);
 
 
 WX_DEFINE_EXPORTED_ARRAY_PTR(wxToolTip *, wxToolTipArray);
 


@@ -84,20 +84,12 @@ public:
     }
 
 
     }
 
 

-    // deprecated functions
-    // --------------------
-
-#if WXWIN_COMPATIBILITY_2_4
-    wxDEPRECATED( int GetNumberOfRowsOrCols() const );
-    wxDEPRECATED( void SetNumberOfRowsOrCols(int n) );
-#endif // WXWIN_COMPATIBILITY_2_4
-

 protected:
     wxRadioBoxBase()
     {
 protected:
     wxRadioBoxBase()
     {

+        m_numCols =
+        m_numRows =

         m_majorDim = 0;
         m_majorDim = 0;

-        m_numCols = 0;
-        m_numRows = 0;

 
 #if wxUSE_TOOLTIPS
         m_itemsTooltips = NULL;
 
 #if wxUSE_TOOLTIPS
         m_itemsTooltips = NULL;