X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae3c17b4013e80b99976c750c19fca47729517f6..474e9711477a5737b232435525da1c87f7eb72d2:/interface/wx/radiobox.h

diff --git a/interface/wx/radiobox.h b/interface/wx/radiobox.h
index 2aeb3772fa..43326c3aeb 100644
--- a/interface/wx/radiobox.h
+++ b/interface/wx/radiobox.h
@@ -8,7 +8,6 @@
 
 /**
     @class wxRadioBox
-    @wxheader{radiobox.h}
 
     A radio box item is used to select one of number of mutually exclusive
     choices.  It is displayed as a vertical column or horizontal row of
@@ -25,7 +24,7 @@
            supported only on PalmOS)
     @endStyleTable
 
-    @beginEventTable{wxCommandEvent}
+    @beginEventEmissionTable{wxCommandEvent}
     @event{EVT_RADIOBOX(id, func)}
            Process a @c wxEVT_COMMAND_RADIOBOX_SELECTED event, when a radiobutton
            is clicked.
@@ -33,9 +32,9 @@
 
     @library{wxcore}
     @category{ctrl}
-    <!-- @appearance{radiobox.png} -->
+    @appearance{radiobox.png}
 
-    @see @ref overview_eventhandling, wxRadioButton, wxCheckBox
+    @see @ref overview_events, wxRadioButton, wxCheckBox
 */
 class wxRadioBox : public wxControl, wxItemContainerImmutable
 {
@@ -58,10 +57,10 @@ public:
         @param label
             Label for the static box surrounding the radio buttons.
         @param pos
-            Window position. If @c wxDefaultPosition is specified then a
+            Window position. If ::wxDefaultPosition is specified then a
             default position is chosen.
         @param size
-            Window size. If @c wxDefaultSize is specified then a default size
+            Window size. If ::wxDefaultSize is specified then a default size
             is chosen.
         @param n
             Number of choices with which to initialize the radiobox.
@@ -86,10 +85,10 @@ public:
                const wxSize& size = wxDefaultSize,
                int n = 0,
                const wxString choices[] = NULL,
-               int majorDimension = 0,
+               int majorDimension = 1,
                long style = wxRA_SPECIFY_COLS,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = "radioBox");
+               const wxString& name = wxRadioBoxNameStr);
 
     /**
         Constructor, creating and showing a radiobox.
@@ -101,10 +100,10 @@ public:
         @param label
             Label for the static box surrounding the radio buttons.
         @param pos
-            Window position. If @c wxDefaultPosition is specified then a
+            Window position. If ::wxDefaultPosition is specified then a
             default position is chosen.
         @param size
-            Window size. If @c wxDefaultSize is specified then a default size
+            Window size. If ::wxDefaultSize is specified then a default size
             is chosen.
         @param choices
             An array of choices with which to initialize the radiobox.
@@ -126,15 +125,15 @@ public:
                const wxPoint& pos,
                const wxSize& size,
                const wxArrayString& choices,
-               int majorDimension = 0,
+               int majorDimension = 1,
                long style = wxRA_SPECIFY_COLS,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = "radioBox");
+               const wxString& name = wxRadioBoxNameStr);
 
     /**
         Destructor, destroying the radiobox item.
     */
-    ~wxRadioBox();
+    virtual ~wxRadioBox();
 
     /**
         Creates the radiobox for two-step construction. See wxRadioBox()
@@ -149,7 +148,7 @@ public:
                 int majorDimension = 0,
                 long style = wxRA_SPECIFY_COLS,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = "radioBox");
+                const wxString& name = wxRadioBoxNameStr);
 
     /**
         Creates the radiobox for two-step construction. See wxRadioBox()
@@ -163,7 +162,7 @@ public:
                 int majorDimension = 0,
                 long style = wxRA_SPECIFY_COLS,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = "radioBox");
+                const wxString& name = wxRadioBoxNameStr);
 
     /**
         Enables or disables an individual button in the radiobox.
@@ -187,15 +186,16 @@ public:
     */
     virtual bool Enable(unsigned int n, bool enable = true);
 
-
     /**
-        Finds a button matching the given string, returning the position if found, or
-        -1 if not found.
+        Finds a button matching the given string, returning the position if found,
+        or @c wxNOT_FOUND if not found.
 
         @param string
             The string to find.
+        @param bCase
+            Should the search be case-sensitive?
     */
-    int FindString(const wxString& string) const;
+    virtual int FindString(const wxString& string, bool bCase = false) const;
 
     /**
         Returns the number of columns in the radiobox.
@@ -209,7 +209,7 @@ public:
         @param pt
             Point in client coordinates.
     */
-    int GetItemFromPoint(const wxPoint pt) const;
+    virtual int GetItemFromPoint(const wxPoint& pt) const;
 
     /**
         Returns the helptext associated with the specified @a item if any or @c
@@ -244,7 +244,7 @@ public:
         @param n
             The zero-based button position.
     */
-    bool IsItemEnabled(unsigned int n) const;
+    virtual bool IsItemEnabled(unsigned int n) const;
 
     /**
         Returns @true if the item is currently shown or @false if it was hidden
@@ -259,7 +259,7 @@ public:
         @param n
             The zero-based button position.
     */
-    bool IsItemShown(unsigned int n) const;
+    virtual bool IsItemShown(unsigned int n) const;
 
     /**
         Sets the helptext for an item. Empty string erases any existing helptext.
@@ -314,5 +314,5 @@ public:
         @endWxPythonOnly
 
     */
-    virtual bool Show(unsigned int item, const bool show = true);
+    virtual bool Show(unsigned int item, bool show = true);
 };