Simple wxBatteryPower API for the support in wxWinCE, wxPalmOS and any other mobile...

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

diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index caa8fbbe9160a3af0550286a0a8ccf091036d361..51721888f2ff7e4c85bf1e0c1d1975226f8bcc90 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$
 // 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_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBOX_H_BASE_
 #define _WX_RADIOBOX_H_BASE_
 

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

     #pragma interface "radioboxbase.h"
 #endif
 
     #pragma interface "radioboxbase.h"
 #endif
 


@@ -25,7 +25,7 @@ WXDLLEXPORT_DATA(extern 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
 // ----------------------------------------------------------------------------
 // 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
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxRadioBoxBase


@@ -52,10 +52,10 @@ public:
         {
             SetSelection(sel);
 
         {
             SetSelection(sel);
 

-            return TRUE;
+            return true;

         }
 
         }
 

-        return FALSE;
+        return false;

     }
 
     // string access
     }
 
     // string access


@@ -76,8 +76,8 @@ public:
     virtual void SetString(int n, const wxString& label) = 0;
 
     // change the individual radio button state
     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;
 
     // layout parameters
     virtual int GetColumnCount() const = 0;


@@ -86,11 +86,20 @@ public:
     // return the item above/below/to the left/right of the given one
     int GetNextItem(int item, wxDirection dir, long style) const;
 
     // 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!
 #if WXWIN_COMPATIBILITY_2_2
     // for compatibility only, don't use these methods in new code!
 #if WXWIN_COMPATIBILITY_2_2

-    int Number() const { return GetCount(); }
-    wxString GetLabel(int n) const { return GetString(n); }
-    void SetLabel(int n, const wxString& label) { SetString(n, label); }
+    wxDEPRECATED( int Number() const );
+    wxDEPRECATED( wxString GetLabel(int n) const );
+    wxDEPRECATED( void SetLabel(int n, const wxString& label) );

 #endif // WXWIN_COMPATIBILITY_2_2
 };
 
 #endif // WXWIN_COMPATIBILITY_2_2
 };
 


@@ -104,10 +113,10 @@ public:
     #include "wx/gtk/radiobox.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/radiobox.h"
     #include "wx/gtk/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(__WXPM__)
     #include "wx/os2/radiobox.h"

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/radiobox.h"

 #endif
 
 #endif // wxUSE_RADIOBOX
 #endif
 
 #endif // wxUSE_RADIOBOX