don't define operator<<(ostream&, wxString) at all if it's already defined in the...

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

diff --git a/include/wx/clrpicker.h b/include/wx/clrpicker.h
index fdd10bd80e94c114bd9750fe8ca4f5788160690a..e2d52184e6fa02fe1e25e346b07039714f6d17a4 100644 (file)
--- a/include/wx/clrpicker.h
+++ b/include/wx/clrpicker.h
@@ -17,11 +17,10 @@
 
 #if wxUSE_COLOURPICKERCTRL
 
-#include "wx/control.h"
 #include "wx/pickerbase.h"
 
 
-class WXDLLIMPEXP_CORE wxColourPickerEvent;
+class WXDLLIMPEXP_FWD_CORE wxColourPickerEvent;
 
 extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerWidgetNameStr[];
 extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerCtrlNameStr[];
@@ -70,7 +69,8 @@ protected:
 //       fact that all classes being mapped as wxColourPickerWidget have the
 //       same prototype for their contructor (and also explains why we use
 //       define instead of a typedef)
-#if defined(__WXGTK24__)        // since GTK > 2.4, there is GtkColorButton
+// since GTK > 2.4, there is GtkColorButton
+#if defined(__WXGTK24__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/clrpicker.h"
     #define wxColourPickerWidget      wxColourButton
 #else
@@ -85,7 +85,7 @@ protected:
 // used, a textctrl next to it.
 // ----------------------------------------------------------------------------
 
-#define wxCLRP_USE_TEXTCTRL       wxPB_USE_TEXTCTRL
+#define wxCLRP_USE_TEXTCTRL       (wxPB_USE_TEXTCTRL)
 #define wxCLRP_DEFAULT_STYLE      0
 
 class WXDLLIMPEXP_CORE wxColourPickerCtrl : public wxPickerBase
@@ -137,11 +137,10 @@ public:        // internal functions
     // event handler for our picker
     void OnColourChange(wxColourPickerEvent &);
 
+protected:
     virtual long GetPickerStyle(long style) const
         { return (style & wxCLRP_SHOW_LABEL); }
 
-protected:
-
     // true if the next UpdateTextCtrl() call is to ignore
     bool m_bIgnoreNextTextCtrlUpdate;
 
@@ -172,10 +171,14 @@ public:
     wxColour GetColour() const { return m_colour; }
     void SetColour(const wxColour &c) { m_colour = c; }
 
+
+    // default copy ctor, assignment operator and dtor are ok
+    virtual wxEvent *Clone() const { return new wxColourPickerEvent(*this); }
+
 private:
     wxColour m_colour;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxColourPickerEvent)
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxColourPickerEvent)
 };
 
 // ----------------------------------------------------------------------------
@@ -190,13 +193,6 @@ typedef void (wxEvtHandler::*wxColourPickerEventFunction)(wxColourPickerEvent&);
 #define EVT_COLOURPICKER_CHANGED(id, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_COLOURPICKER_CHANGED, id, wxColourPickerEventHandler(fn))
 
-#ifdef _WX_DEFINE_DATE_EVENTS_
-    DEFINE_EVENT_TYPE(wxEVT_COMMAND_COLOURPICKER_CHANGED)
-
-    IMPLEMENT_DYNAMIC_CLASS(wxColourPickerEvent, wxCommandEvent)
-#endif
-
-
 
 #endif // wxUSE_COLOURPICKERCTRL