Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/checkbox.h b/interface/wx/checkbox.h
index 94bad3654817015e8ea99d24abdc523a9d5f2f97..cddfaf23936abdb8f17489176c837ec9f5bf5087 100644 (file)
--- a/interface/wx/checkbox.h
+++ b/interface/wx/checkbox.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxCheckBox
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxCheckBox
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

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

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -39,15 +39,15 @@ enum wxCheckBoxState
            Makes the text appear on the left of the checkbox.
     @endStyleTable
 
            Makes the text appear on the left of the checkbox.
     @endStyleTable
 

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

     @event{EVT_CHECKBOX(id, func)}
     @event{EVT_CHECKBOX(id, func)}

-           Process a wxEVT_COMMAND_CHECKBOX_CLICKED event, when the checkbox
+           Process a @c wxEVT_COMMAND_CHECKBOX_CLICKED event, when the checkbox

            is clicked.
     @endEventTable
 
     @library{wxcore}
     @category{ctrl}
            is clicked.
     @endEventTable
 
     @library{wxcore}
     @category{ctrl}

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

 
     @see wxRadioButton, wxCommandEvent
 */
 
     @see wxRadioButton, wxCommandEvent
 */


@@ -71,11 +71,11 @@ public:
         @param label
             Text to be displayed next to the checkbox.
         @param pos
         @param label
             Text to be displayed next to the checkbox.
         @param pos

-            Checkbox position. If wxDefaultPosition is specified then a default
-            position is chosen.
+            Checkbox position. 
+            If ::wxDefaultPosition is specified then a default position is chosen.

         @param size
         @param size

-            Checkbox size. If wxDefaultSize is specified then a default size is
-            chosen.
+            Checkbox size. 
+            If ::wxDefaultSize is specified then a default size is chosen.

         @param style
             Window style. See wxCheckBox.
         @param validator
         @param style
             Window style. See wxCheckBox.
         @param validator


@@ -148,7 +148,7 @@ public:
 
     /**
         Sets the checkbox to the given state. This does not cause a
 
     /**
         Sets the checkbox to the given state. This does not cause a

-        wxEVT_COMMAND_CHECKBOX_CLICKED event to get emitted.
+        @c wxEVT_COMMAND_CHECKBOX_CLICKED event to get emitted.

 
         @param state
             If @true, the check is on, otherwise it is off.
 
         @param state
             If @true, the check is on, otherwise it is off.


@@ -157,7 +157,7 @@ public:
 
     /**
         Sets the checkbox to the given state. This does not cause a
 
     /**
         Sets the checkbox to the given state. This does not cause a

-        wxEVT_COMMAND_CHECKBOX_CLICKED event to get emitted.
+        @c wxEVT_COMMAND_CHECKBOX_CLICKED event to get emitted.

 
         Asserts when the checkbox is a 2-state checkbox and setting the state
         to wxCHK_UNDETERMINED.
 
         Asserts when the checkbox is a 2-state checkbox and setting the state
         to wxCHK_UNDETERMINED.