X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae3c17b4013e80b99976c750c19fca47729517f6..574be073c070a9bbe81ad68e98187b0b9e82c2df:/interface/wx/clrpicker.h?ds=inline diff --git a/interface/wx/clrpicker.h b/interface/wx/clrpicker.h index 062c134d13..551711ff51 100644 --- a/interface/wx/clrpicker.h +++ b/interface/wx/clrpicker.h @@ -8,7 +8,6 @@ /** @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 @@ -30,7 +29,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 @@ -40,7 +39,7 @@ @library{wxcore} @category{pickers} - <!-- @appearance{colourpickerctrl.png} --> + @appearance{colourpickerctrl.png} @see wxColourDialog, wxColourPickerEvent */ @@ -51,12 +50,12 @@ public: 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. @@ -82,12 +81,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. @@ -107,7 +106,6 @@ public: /** @class wxColourPickerEvent - @wxheader{clrpicker.h} This event class is used for the events generated by wxColourPickerCtrl.