undo the last change as it results in buildbot configuration error

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

diff --git a/interface/wx/clrpicker.h b/interface/wx/clrpicker.h
index 986f56b2cb69e4a8f58b93e577cb8ef4a212fc11..551711ff518f6999ab3baa7fae4bd64959952fd7 100644 (file)
--- a/interface/wx/clrpicker.h
+++ b/interface/wx/clrpicker.h
@@ -29,7 +29,7 @@
            (instead of no label at all).
     @endStyleTable
 
            (instead of no label at all).
     @endStyleTable
 

-    @beginEventTable{wxColourPickerEvent}
+    @beginEventEmissionTable{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
     @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


@@ -39,7 +39,7 @@
 
     @library{wxcore}
     @category{pickers}
 
     @library{wxcore}
     @category{pickers}

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

 
     @see wxColourDialog, wxColourPickerEvent
 */
 
     @see wxColourDialog, wxColourPickerEvent
 */


@@ -50,7 +50,7 @@ public:
         Initializes the object and calls Create() with all the parameters.
     */
     wxColourPickerCtrl(wxWindow* parent, wxWindowID id,
         Initializes the object and calls Create() with all the parameters.
     */
     wxColourPickerCtrl(wxWindow* parent, wxWindowID id,

-                       const wxColour& colour = wxBLACK,
+                       const wxColour& colour = *wxBLACK,

                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
                        long style = wxCLRP_DEFAULT_STYLE,
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
                        long style = wxCLRP_DEFAULT_STYLE,


@@ -81,7 +81,7 @@ public:
                 creation failed.
     */
     bool Create(wxWindow* parent, wxWindowID id,
                 creation failed.
     */
     bool Create(wxWindow* parent, wxWindowID id,

-                const wxColour& colour = wxBLACK,
+                const wxColour& colour = *wxBLACK,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxCLRP_DEFAULT_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxCLRP_DEFAULT_STYLE,