Make list consistent with tree in terms of Vetoed changes closing the inline edit...

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

diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index aa7950a3e13d339dbdd578d6e0e97caa627c267c..fa3db009e4f064f1c3ac0f94f88baa30e3009457 100644 (file)
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -5,14 +5,14 @@
 // Modified by:
 // Created:     10.09.00
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows license
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBOX_H_BASE_
 #define _WX_RADIOBOX_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "radioboxbase.h"
 #endif
 
@@ -20,12 +20,12 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxRadioBoxNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxRadioBoxNameStr;
 
 // ----------------------------------------------------------------------------
 // wxRadioBoxBase is not a normal base class, but rather a mix-in because the
 // real wxRadioBox derives from different classes on different platforms: for
-// example, it is a wxStaticBox in wxUniv but not in wxMSW
+// example, it is a wxStaticBox in wxUniv and wxMSW but not in other ports
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxRadioBoxBase
@@ -52,10 +52,10 @@ public:
         {
             SetSelection(sel);
 
-            return TRUE;
+            return true;
         }
 
-        return FALSE;
+        return false;
     }
 
     // string access
@@ -76,8 +76,8 @@ public:
     virtual void SetString(int n, const wxString& label) = 0;
 
     // change the individual radio button state
-    virtual void Enable(int n, bool enable = TRUE) = 0;
-    virtual void Show(int n, bool show = TRUE) = 0;
+    virtual void Enable(int n, bool enable = true) = 0;
+    virtual void Show(int n, bool show = true) = 0;
 
     // layout parameters
     virtual int GetColumnCount() const = 0;
@@ -86,12 +86,21 @@ public:
     // return the item above/below/to the left/right of the given one
     int GetNextItem(int item, wxDirection dir, long style) const;
 
+
+    // deprecated functions
+    // --------------------
+
+#if WXWIN_COMPATIBILITY_2_4
+    wxDEPRECATED( int GetNumberOfRowsOrCols() const );
+    wxDEPRECATED( void SetNumberOfRowsOrCols(int n) );
+#endif // WXWIN_COMPATIBILITY_2_4
+
     // for compatibility only, don't use these methods in new code!
-#ifdef WXWIN_COMPATIBILITY_2
-    int Number() const { return GetCount(); }
-    wxString GetLabel(int n) const { return GetString(n); }
-    void SetLabel(int n, const wxString& label) { SetString(n, label); }
-#endif // WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2_2
+    wxDEPRECATED( int Number() const );
+    wxDEPRECATED( wxString GetLabel(int n) const );
+    wxDEPRECATED( void SetLabel(int n, const wxString& label) );
+#endif // WXWIN_COMPATIBILITY_2_2
 };
 
 #if defined(__WXUNIVERSAL__)
@@ -102,14 +111,12 @@ public:
     #include "wx/motif/radiobox.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/radiobox.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/radiobox.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/radiobox.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/radiobox.h"
 #elif defined(__WXPM__)
     #include "wx/os2/radiobox.h"
-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/radiobox.h"
 #endif
 
 #endif // wxUSE_RADIOBOX