Minor patch for state icons patch

[wxWidgets.git] / interface / clrpicker.h

diff --git a/interface/clrpicker.h b/interface/clrpicker.h
index 1aa9f3b80d34e0a81c551709c1e20c2ddcf81423..062c134d13f9114444f4cdecdd9c2bb400d45f10 100644 (file)
--- a/interface/clrpicker.h
+++ b/interface/clrpicker.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        clrpicker.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        clrpicker.h

-// Purpose:     documentation for wxColourPickerCtrl class
+// Purpose:     interface of wxColourPickerCtrl

 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Licence:     wxWindows license
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Licence:     wxWindows license


@@ -10,40 +10,45 @@
     @class wxColourPickerCtrl
     @wxheader{clrpicker.h}
 
     @class wxColourPickerCtrl
     @wxheader{clrpicker.h}
 

-    This control allows the user to select a colour. The generic implementation is
-    a button which brings up a wxColourDialog when clicked. Native implementation
-    may differ but this is usually a (small) widget which give access to the
-    colour-chooser
-    dialog.
-    It is only available if @c wxUSE_COLOURPICKERCTRL is set to 1 (the default).
+    This control allows the user to select a colour. The generic implementation
+    is a button which brings up a wxColourDialog when clicked. Native
+    implementation may differ but this is usually a (small) widget which give
+    access to the colour-chooser dialog. It is only available if
+    @c wxUSE_COLOURPICKERCTRL is set to 1 (the default).

 
     @beginStyleTable
 
     @beginStyleTable

-    @style{wxCLRP_DEFAULT_STYLE}:
+    @style{wxCLRP_DEFAULT_STYLE}

            The default style: 0.
            The default style: 0.

-    @style{wxCLRP_USE_TEXTCTRL}:
+    @style{wxCLRP_USE_TEXTCTRL}

            Creates a text control to the left of the picker button which is
            completely managed by the wxColourPickerCtrl and which can be used
            by the user to specify a colour (see SetColour). The text control
            is automatically synchronized with button's value. Use functions
            defined in wxPickerBase to modify the text control.
            Creates a text control to the left of the picker button which is
            completely managed by the wxColourPickerCtrl and which can be used
            by the user to specify a colour (see SetColour). The text control
            is automatically synchronized with button's value. Use functions
            defined in wxPickerBase to modify the text control.

-    @style{wxCLRP_SHOW_LABEL}:
+    @style{wxCLRP_SHOW_LABEL}

            Shows the colour in HTML form (AABBCC) as colour button label
            (instead of no label at all).
     @endStyleTable
 
            Shows the colour in HTML form (AABBCC) as colour button label
            (instead of no label at all).
     @endStyleTable
 

+    @beginEventTable{wxColourPickerEvent}
+    @event{EVT_COLOURPICKER_CHANGED(id, func)}
+           The user changed the colour selected in the control either using the
+           button or using text control (see @c wxCLRP_USE_TEXTCTRL; note that
+           in this case the event is fired only if the user’s input is valid,
+           i.e. recognizable).
+    @endEventTable
+

     @library{wxcore}
     @library{wxcore}

-    @category{miscpickers}
-    @appearance{colourpickerctrl.png}
+    @category{pickers}
+    <!-- @appearance{colourpickerctrl.png} -->

 
 

-    @seealso
-    wxColourDialog, wxColourPickerEvent
+    @see wxColourDialog, wxColourPickerEvent

 */
 class wxColourPickerCtrl : public wxPickerBase
 {
 public:
     /**
 */
 class wxColourPickerCtrl : public wxPickerBase
 {
 public:
     /**

-        Initializes the object and calls Create() with
-        all the parameters.
+        Initializes the object and calls Create() with all the parameters.

     */
     wxColourPickerCtrl(wxWindow* parent, wxWindowID id,
                        const wxColour& colour = wxBLACK,
     */
     wxColourPickerCtrl(wxWindow* parent, wxWindowID id,
                        const wxColour& colour = wxBLACK,


@@ -54,6 +59,8 @@ public:
                        const wxString& name = "colourpickerctrl");
 
     /**
                        const wxString& name = "colourpickerctrl");
 
     /**

+        Creates a colour picker with the given arguments.
+

         @param parent
             Parent window, must not be non-@NULL.
         @param id
         @param parent
             Parent window, must not be non-@NULL.
         @param id


@@ -70,9 +77,9 @@ public:
             Validator which can be used for additional date checks.
         @param name
             Control name.
             Validator which can be used for additional date checks.
         @param name
             Control name.

-        
-        @returns @true if the control was successfully created or @false if
-                 creation failed.
+
+        @return @true if the control was successfully created or @false if
+                creation failed.

     */
     bool Create(wxWindow* parent, wxWindowID id,
                 const wxColour& colour = wxBLACK,
     */
     bool Create(wxWindow* parent, wxWindowID id,
                 const wxColour& colour = wxBLACK,


@@ -85,11 +92,11 @@ public:
     /**
         Returns the currently selected colour.
     */
     /**
         Returns the currently selected colour.
     */

-    wxColour GetColour();
+    wxColour GetColour() const;

 
     //@{
     /**
 
     //@{
     /**

-        Sets the currently selected colour. See wxColour::Set.
+        Sets the currently selected colour. See wxColour::Set().

     */
     void SetColour(const wxColour& col);
     void SetColour(const wxString& colname);
     */
     void SetColour(const wxColour& col);
     void SetColour(const wxString& colname);


@@ -97,18 +104,22 @@ public:
 };
 
 
 };
 
 

+

 /**
     @class wxColourPickerEvent
     @wxheader{clrpicker.h}
 
 /**
     @class wxColourPickerEvent
     @wxheader{clrpicker.h}
 

-    This event class is used for the events generated by
-    wxColourPickerCtrl.
+    This event class is used for the events generated by wxColourPickerCtrl.
+
+    @beginEventTable{wxColourPickerEvent}
+    @event{EVT_COLOURPICKER_CHANGED(id, func)}
+           Generated whenever the selected colour changes.
+    @endEventTable

 
     @library{wxcore}
 
     @library{wxcore}

-    @category{FIXME}
+    @category{events}

 
 

-    @seealso
-    wxColourPickerCtrl
+    @see wxColourPickerCtrl

 */
 class wxColourPickerEvent : public wxCommandEvent
 {
 */
 class wxColourPickerEvent : public wxCommandEvent
 {


@@ -122,10 +133,11 @@ public:
     /**
         Retrieve the colour the user has just selected.
     */
     /**
         Retrieve the colour the user has just selected.
     */

-    wxColour GetColour();
+    wxColour GetColour() const;

 
     /**
         Set the colour associated with the event.
     */
     void SetColour(const wxColour& pos);
 };
 
     /**
         Set the colour associated with the event.
     */
     void SetColour(const wxColour& pos);
 };

+