Doc and comment cleanup, fixes, tweaks

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

diff --git a/interface/wx/clrpicker.h b/interface/wx/clrpicker.h
index 062c134d13f9114444f4cdecdd9c2bb400d45f10..af52b96cc4fcce13293fbec2f4e9700fe2d7bfc3 100644 (file)
--- a/interface/wx/clrpicker.h
+++ b/interface/wx/clrpicker.h
@@ -8,7 +8,6 @@
 
 /**
     @class wxColourPickerCtrl
 
 /**
     @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
 
     This control allows the user to select a colour. The generic implementation
     is a button which brings up a wxColourDialog when clicked. Native


@@ -51,12 +50,12 @@ 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 wxValidator& validator = wxDefaultValidator,
                        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.
 
     /**
         Creates a colour picker with the given arguments.


@@ -82,12 +81,12 @@ 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 wxValidator& validator = wxDefaultValidator,
                 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.
 
     /**
         Returns the currently selected colour.


@@ -107,7 +106,6 @@ public:
 
 /**
     @class wxColourPickerEvent
 
 /**
     @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.