no real change; just add the standard separator where it's missing

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

diff --git a/interface/wx/radiobox.h b/interface/wx/radiobox.h
index e75165e4c11b660d16b93f7973f97acdaaeb43af..43326c3aeb613f3ca04150af1983b28417545015 100644 (file)
--- a/interface/wx/radiobox.h
+++ b/interface/wx/radiobox.h
@@ -24,7 +24,7 @@
            supported only on PalmOS)
     @endStyleTable
 
            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.
     @event{EVT_RADIOBOX(id, func)}
            Process a @c wxEVT_COMMAND_RADIOBOX_SELECTED event, when a radiobutton
            is clicked.


@@ -32,9 +32,9 @@
 
     @library{wxcore}
     @category{ctrl}
 
     @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
 {
 */
 class wxRadioBox : public wxControl, wxItemContainerImmutable
 {


@@ -57,10 +57,10 @@ public:
         @param label
             Label for the static box surrounding the radio buttons.
         @param pos
         @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
             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.
             is chosen.
         @param n
             Number of choices with which to initialize the radiobox.


@@ -85,10 +85,10 @@ public:
                const wxSize& size = wxDefaultSize,
                int n = 0,
                const wxString choices[] = NULL,
                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,
                long style = wxRA_SPECIFY_COLS,
                const wxValidator& validator = wxDefaultValidator,

-               const wxString& name = "radioBox");
+               const wxString& name = wxRadioBoxNameStr);

 
     /**
         Constructor, creating and showing a radiobox.
 
     /**
         Constructor, creating and showing a radiobox.


@@ -100,10 +100,10 @@ public:
         @param label
             Label for the static box surrounding the radio buttons.
         @param pos
         @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
             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.
             is chosen.
         @param choices
             An array of choices with which to initialize the radiobox.


@@ -125,10 +125,10 @@ public:
                const wxPoint& pos,
                const wxSize& size,
                const wxArrayString& choices,
                const wxPoint& pos,
                const wxSize& size,
                const wxArrayString& choices,

-               int majorDimension = 0,
+               int majorDimension = 1,

                long style = wxRA_SPECIFY_COLS,
                const wxValidator& validator = wxDefaultValidator,
                long style = wxRA_SPECIFY_COLS,
                const wxValidator& validator = wxDefaultValidator,

-               const wxString& name = "radioBox");
+               const wxString& name = wxRadioBoxNameStr);

 
     /**
         Destructor, destroying the radiobox item.
 
     /**
         Destructor, destroying the radiobox item.


@@ -148,7 +148,7 @@ public:
                 int majorDimension = 0,
                 long style = wxRA_SPECIFY_COLS,
                 const wxValidator& validator = wxDefaultValidator,
                 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()
 
     /**
         Creates the radiobox for two-step construction. See wxRadioBox()


@@ -162,7 +162,7 @@ public:
                 int majorDimension = 0,
                 long style = wxRA_SPECIFY_COLS,
                 const wxValidator& validator = wxDefaultValidator,
                 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.
 
     /**
         Enables or disables an individual button in the radiobox.


@@ -186,15 +186,16 @@ public:
     */
     virtual bool Enable(unsigned int n, bool enable = true);
 
     */
     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 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.
 
     /**
         Returns the number of columns in the radiobox.


@@ -208,7 +209,7 @@ public:
         @param pt
             Point in client coordinates.
     */
         @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
 
     /**
         Returns the helptext associated with the specified @a item if any or @c


@@ -313,5 +314,5 @@ public:
         @endWxPythonOnly
 
     */
         @endWxPythonOnly
 
     */

-    virtual bool Show(unsigned int item, const bool show = true);
+    virtual bool Show(unsigned int item, bool show = true);

 };
 };