Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

[wxWidgets.git] / interface / wx / radiobut.h

diff --git a/interface/wx/radiobut.h b/interface/wx/radiobut.h
index dfce977c5067eea1d67c371097d4c6190081f599..26366ecdc3954345ca3f5b7fa7515203d93bea1c 100644 (file)
--- a/interface/wx/radiobut.h
+++ b/interface/wx/radiobut.h
@@ -3,12 +3,11 @@
 // Purpose:     interface of wxRadioButton
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxRadioButton
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
     @class wxRadioButton
 /////////////////////////////////////////////////////////////////////////////
 
 /**
     @class wxRadioButton

-    @wxheader{radiobut.h}

 
     A radio button item is a button which usually denotes one of several
     mutually exclusive options. It has a text label next to a (usually) round
 
     A radio button item is a button which usually denotes one of several
     mutually exclusive options. It has a text label next to a (usually) round


@@ -31,7 +30,7 @@
            only on PalmOS).
     @endStyleTable
 
            only on PalmOS).
     @endStyleTable
 

-    @beginEventTable{wxCommandEvent}
+    @beginEventEmissionTable{wxCommandEvent}

     @event{EVT_RADIOBUTTON(id, func)}
            Process a @c wxEVT_COMMAND_RADIOBUTTON_SELECTED event, when the
            radiobutton is clicked.
     @event{EVT_RADIOBUTTON(id, func)}
            Process a @c wxEVT_COMMAND_RADIOBUTTON_SELECTED event, when the
            radiobutton is clicked.


@@ -39,14 +38,13 @@
 
     @library{wxcore}
     @category{ctrl}
 
     @library{wxcore}
     @category{ctrl}

-    <!-- @appearance{radiobutton.png} -->
+    @appearance{radiobutton.png}

 
 

-    @see @ref overview_eventhandling, wxRadioBox, wxCheckBox
+    @see @ref overview_events, wxRadioBox, wxCheckBox

 */
 class wxRadioButton : public wxControl
 {
 public:
 */
 class wxRadioButton : public wxControl
 {
 public:

-

     /**
         Default constructor.
 
     /**
         Default constructor.
 


@@ -64,11 +62,11 @@ public:
         @param label
             Label for the radio button.
         @param pos
         @param label
             Label for the radio button.
         @param pos

-            Window position. If @c wxDefaultPosition is specified then a default
-        position is chosen.
+            Window position. If ::wxDefaultPosition is specified then a default
+            position is chosen.

         @param size
         @param size

-            Window size. If @c wxDefaultSize is specified then a default size
-        is chosen.
+            Window size. If ::wxDefaultSize is specified then a default size
+            is chosen.

         @param style
             Window style. See wxRadioButton.
         @param validator
         @param style
             Window style. See wxRadioButton.
         @param validator


@@ -84,37 +82,39 @@ public:
                   const wxSize& size = wxDefaultSize,
                   long style = 0,
                   const wxValidator& validator = wxDefaultValidator,
                   const wxSize& size = wxDefaultSize,
                   long style = 0,
                   const wxValidator& validator = wxDefaultValidator,

-                  const wxString& name = "radioButton");
+                  const wxString& name = wxRadioButtonNameStr);

 
     /**
         Destructor, destroying the radio button item.
     */
 
     /**
         Destructor, destroying the radio button item.
     */

-    ~wxRadioButton();
+    virtual ~wxRadioButton();

 
     /**
         Creates the choice for two-step construction. See wxRadioButton() for
         further details.
     */
 
     /**
         Creates the choice for two-step construction. See wxRadioButton() for
         further details.
     */

-    bool Create(wxWindow* parent, wxWindowID id,
-                const wxString& label,
+    bool Create(wxWindow* parent, wxWindowID id, const wxString& label,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxPoint& pos = wxDefaultPosition,

-                const wxSize& size = wxDefaultSize,
-                long style = 0,
+                const wxSize& size = wxDefaultSize, long style = 0,

                 const wxValidator& validator = wxDefaultValidator,
                 const wxValidator& validator = wxDefaultValidator,

-                const wxString& name = "radioButton");
+                const wxString& name = wxRadioButtonNameStr);

 
     /**
         Returns @true if the radio button is depressed, @false otherwise.
     */
 
     /**
         Returns @true if the radio button is depressed, @false otherwise.
     */

-    bool GetValue() const;
+    virtual bool GetValue() const;

 
     /**
         Sets the radio button to selected or deselected status. This does not cause a
         @c wxEVT_COMMAND_RADIOBUTTON_SELECTED event to get emitted.
 
     /**
         Sets the radio button to selected or deselected status. This does not cause a
         @c wxEVT_COMMAND_RADIOBUTTON_SELECTED event to get emitted.

+        
+        If the radio button belongs to a group you can only select a radio button
+        (which will deselect the previously selected button) and you therefore
+        must not call this method with value set to @false in that case.

 
         @param value
             @true to select, @false to deselect.
     */
 
         @param value
             @true to select, @false to deselect.
     */

-    void SetValue(const bool value);
+    virtual void SetValue(bool value);

 };
 
 };