even more interface fixes

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

diff --git a/interface/wx/clrpicker.h b/interface/wx/clrpicker.h
index a3fa169d80cdebb14c74b08688d5ccfc95a3a699..af52b96cc4fcce13293fbec2f4e9700fe2d7bfc3 100644 (file)
--- a/interface/wx/clrpicker.h
+++ b/interface/wx/clrpicker.h
@@ -50,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.


@@ -81,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.