projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
console builds need another header from xcode
[wxWidgets.git]
/
include
/
wx
/
clrpicker.h
diff --git
a/include/wx/clrpicker.h
b/include/wx/clrpicker.h
index efd635bee3548376eb716db6da8417abb262ffdf..59edfe8436e8d89c862ad96cd27fe0c90f8484b2 100644
(file)
--- a/
include/wx/clrpicker.h
+++ b/
include/wx/clrpicker.h
@@
-22,8
+22,8
@@
class WXDLLIMPEXP_FWD_CORE wxColourPickerEvent;
class WXDLLIMPEXP_FWD_CORE wxColourPickerEvent;
-extern WXDLL
EXPORT_DATA
(const char) wxColourPickerWidgetNameStr[];
-extern WXDLL
EXPORT_DATA
(const char) wxColourPickerCtrlNameStr[];
+extern WXDLL
IMPEXP_DATA_CORE
(const char) wxColourPickerWidgetNameStr[];
+extern WXDLL
IMPEXP_DATA_CORE
(const char) wxColourPickerCtrlNameStr[];
// show the colour in HTML form (#AABBCC) as colour button label
#define wxCLRBTN_SHOW_LABEL 100
// 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
// ----------------------------------------------------------------------------
// 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
{
class WXDLLIMPEXP_CORE wxColourPickerEvent : public wxCommandEvent
{