Convert wxFSW_EVENT_{WARNING,ERROR} to string correctly.

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

diff --git a/interface/wx/clrpicker.h b/interface/wx/clrpicker.h
index a3fa169d80cdebb14c74b08688d5ccfc95a3a699..e6cfa8e5152563ffd281eeb99b8027030a913e1c 100644 (file)
--- a/interface/wx/clrpicker.h
+++ b/interface/wx/clrpicker.h
@@ -3,9 +3,16 @@
 // Purpose:     interface of wxColourPickerCtrl
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#define wxCLRP_USE_TEXTCTRL       (wxPB_USE_TEXTCTRL)
+#define wxCLRP_DEFAULT_STYLE      0
+#define wxCLRP_SHOW_LABEL         0x0008
+
+wxEventType wxEVT_COMMAND_COLOURPICKER_CHANGED;
+
+
 /**
     @class wxColourPickerCtrl
 
@@ -29,7 +36,7 @@
            (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
@@ -39,23 +46,25 @@
 
     @library{wxcore}
     @category{pickers}
-    <!-- @appearance{colourpickerctrl.png} -->
+    @appearance{colourpickerctrl}
 
     @see wxColourDialog, wxColourPickerEvent
 */
 class wxColourPickerCtrl : public wxPickerBase
 {
 public:
+    wxColourPickerCtrl();
+    
     /**
         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 wxValidator& validator = wxDefaultValidator,
-                       const wxString& name = "colourpickerctrl");
+                       const wxString& name = wxColourPickerCtrlNameStr);
 
     /**
         Creates a colour picker with the given arguments.
@@ -81,12 +90,12 @@ public:
                 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 wxValidator& validator = wxDefaultValidator,
-                const wxString& name = "colourpickerctrl");
+                const wxString& name = wxColourPickerCtrlNameStr);
 
     /**
         Returns the currently selected colour.
@@ -122,6 +131,8 @@ public:
 class wxColourPickerEvent : public wxCommandEvent
 {
 public:
+    wxColourPickerEvent();
+
     /**
         The constructor is not normally used by the user code.
     */