Define WXBUILDING in Xcode projects.

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

diff --git a/include/wx/clrpicker.h b/include/wx/clrpicker.h
index 9228596daaa70a5fb3388ff180291c1d0ca5361c..572b7299f35425678770d77650d73e4441176e68 100644 (file)
--- a/include/wx/clrpicker.h
+++ b/include/wx/clrpicker.h
@@ -156,14 +156,14 @@ private:
 // wxColourPickerEvent: used by wxColourPickerCtrl only
 // ----------------------------------------------------------------------------
 
 // wxColourPickerEvent: used by wxColourPickerCtrl only
 // ----------------------------------------------------------------------------
 

-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_COLOURPICKER_CHANGED, wxColourPickerEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COLOURPICKER_CHANGED, wxColourPickerEvent );

 
 class WXDLLIMPEXP_CORE wxColourPickerEvent : public wxCommandEvent
 {
 public:
     wxColourPickerEvent() {}
     wxColourPickerEvent(wxObject *generator, int id, const wxColour &col)
 
 class WXDLLIMPEXP_CORE wxColourPickerEvent : public wxCommandEvent
 {
 public:
     wxColourPickerEvent() {}
     wxColourPickerEvent(wxObject *generator, int id, const wxColour &col)

-        : wxCommandEvent(wxEVT_COMMAND_COLOURPICKER_CHANGED, id),
+        : wxCommandEvent(wxEVT_COLOURPICKER_CHANGED, id),

           m_colour(col)
     {
         SetEventObject(generator);
           m_colour(col)
     {
         SetEventObject(generator);


@@ -192,9 +192,12 @@ typedef void (wxEvtHandler::*wxColourPickerEventFunction)(wxColourPickerEvent&);
     wxEVENT_HANDLER_CAST(wxColourPickerEventFunction, func)
 
 #define EVT_COLOURPICKER_CHANGED(id, fn) \
     wxEVENT_HANDLER_CAST(wxColourPickerEventFunction, func)
 
 #define EVT_COLOURPICKER_CHANGED(id, fn) \

-    wx__DECLARE_EVT1(wxEVT_COMMAND_COLOURPICKER_CHANGED, id, wxColourPickerEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_COLOURPICKER_CHANGED, id, wxColourPickerEventHandler(fn))

 
 
 
 

+// old wxEVT_COMMAND_* constant
+#define wxEVT_COMMAND_COLOURPICKER_CHANGED   wxEVT_COLOURPICKER_CHANGED
+

 #endif // wxUSE_COLOURPICKERCTRL
 
 #endif // _WX_CLRPICKER_H_BASE_
 #endif // wxUSE_COLOURPICKERCTRL
 
 #endif // _WX_CLRPICKER_H_BASE_