X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff654490b7cb185631a1dc4621094d88643ccf41..dd9f8b6bb6935360a8271dc3e8749fb026b601a8:/include/wx/clrpicker.h?ds=sidebyside diff --git a/include/wx/clrpicker.h b/include/wx/clrpicker.h index 151693bc07..3d07cfa559 100644 --- a/include/wx/clrpicker.h +++ b/include/wx/clrpicker.h @@ -22,8 +22,8 @@ class WXDLLIMPEXP_FWD_CORE wxColourPickerEvent; -extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerWidgetNameStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerCtrlNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxColourPickerWidgetNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxColourPickerCtrlNameStr[]; // show the colour in HTML form (#AABBCC) as colour button label #define wxCLRBTN_SHOW_LABEL 100 @@ -160,9 +160,7 @@ private: // wxColourPickerEvent: used by wxColourPickerCtrl only // ---------------------------------------------------------------------------- -BEGIN_DECLARE_EVENT_TYPES() - DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_CORE, wxEVT_COMMAND_COLOURPICKER_CHANGED, 1102) -END_DECLARE_EVENT_TYPES() +extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_COLOURPICKER_CHANGED; class WXDLLIMPEXP_CORE wxColourPickerEvent : public wxCommandEvent {