Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/tglbtn.h b/interface/wx/tglbtn.h
index b99f276a6ae7b4459a7699dbb39f6f050384b1b7..866be9765e9b55c0259d08cfa486019df2a86994 100644 (file)
--- a/interface/wx/tglbtn.h
+++ b/interface/wx/tglbtn.h
@@ -1,32 +1,30 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        tglbtn.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        tglbtn.h

-// Purpose:     interface of wxBitmapToggleButton
+// Purpose:     interface of wxBitmapToggleButton, wxToggleButton

 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

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

 /////////////////////////////////////////////////////////////////////////////
 
 
 /**
     @class wxToggleButton
 
 /////////////////////////////////////////////////////////////////////////////
 
 
 /**
     @class wxToggleButton
 

-    wxToggleButton is a button that stays pressed when clicked by the user. In
-    other words, it is similar to wxCheckBox in
-    functionality but looks like a wxButton.
+    wxToggleButton is a button that stays pressed when clicked by the user.
+    In other words, it is similar to wxCheckBox in functionality but looks like a wxButton.

 
     Since wxWidgets version 2.9.0 this control emits an update UI event.
 
 
     Since wxWidgets version 2.9.0 this control emits an update UI event.
 

-    You can see wxToggleButton in action in the sixth page of the
-    controls() sample.
+    You can see wxToggleButton in action in @ref page_samples_controls.

 
 

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

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

-           Handles a toggle button click event.
+        Handles a toggle button click event.

     @endEventTable
 
     @library{wxcore}
     @category{ctrl}
     @endEventTable
 
     @library{wxcore}
     @category{ctrl}

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

 
     @see wxCheckBox, wxButton, wxBitmapToggleButton
 */
 
     @see wxCheckBox, wxButton, wxBitmapToggleButton
 */


@@ -48,14 +46,14 @@ public:
         @param label
             Text to be displayed next to the toggle button.
         @param pos
         @param label
             Text to be displayed next to the toggle button.
         @param pos

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

         @param size
         @param size

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

         @param style
             Window style. See wxToggleButton.
         @param style
             Window style. See wxToggleButton.

-        @param validator
+        @param val

             Window validator.
         @param name
             Window name.
             Window validator.
         @param name
             Window name.


@@ -76,8 +74,8 @@ public:
     virtual ~wxToggleButton();
 
     /**
     virtual ~wxToggleButton();
 
     /**

-        Creates the toggle button for two-step construction. See wxToggleButton()
-        for details.
+        Creates the toggle button for two-step construction.
+        See wxToggleButton() for details.

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


@@ -95,8 +93,8 @@ public:
     virtual bool GetValue() const;
 
     /**
     virtual bool GetValue() const;
 
     /**

-        Sets the toggle button to the given state. This does not cause a
-        @c EVT_TOGGLEBUTTON event to be emitted.
+        Sets the toggle button to the given state.
+        This does not cause a @c EVT_TOGGLEBUTTON event to be emitted.

 
         @param state
             If @true, the button is pressed.
 
         @param state
             If @true, the button is pressed.


@@ -108,19 +106,25 @@ public:
 /**
     @class wxBitmapToggleButton
 
 /**
     @class wxBitmapToggleButton
 

-    wxBitmapToggleButton is a wxToggleButton
-    that contains a bitmap instead of text.
+    wxBitmapToggleButton is a wxToggleButton that contains a bitmap instead of
+    text.
+
+    This class is not available in all ports currently (although it is
+    available in the major ones), test for @c wxHAS_BITMAPTOGGLEBUTTON to
+    determine whether it can be used (in addition for possibly testing for
+    @c wxUSE_TOGGLEBTN which can be set to 0 to explicitly disable support for
+    this class and wxToggleButton).

 
     This control emits an update UI event.
 
 
     This control emits an update UI event.
 

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

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

-           Handles a toggle button click event.
+        Handles a toggle button click event.

     @endEventTable
 
     @library{wxcore}
     @category{ctrl}
     @endEventTable
 
     @library{wxcore}
     @category{ctrl}

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

 */
 class wxBitmapToggleButton : public wxControl
 {
 */
 class wxBitmapToggleButton : public wxControl
 {


@@ -161,8 +165,8 @@ public:
     virtual bool GetValue() const;
 
     /**
     virtual bool GetValue() const;
 
     /**

-        Sets the toggle button to the given state. This does not cause a
-        @c EVT_TOGGLEBUTTON event to be emitted.
+        Sets the toggle button to the given state.
+        This does not cause a @c EVT_TOGGLEBUTTON event to be emitted.

 
         @param state
             If @true, the button is pressed.
 
         @param state
             If @true, the button is pressed.