fixing warning and compile error against 10.4

[wxWidgets.git] / include / wx / generic / colrdlgg.h

diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h
index 0d59436e90d4d36605449e3f991d575edb8e1649..e1b9e4268f51ee41e54d8d147b4956c05e363f88 100644 (file)
--- a/include/wx/generic/colrdlgg.h
+++ b/include/wx/generic/colrdlgg.h
@@ -29,15 +29,15 @@
 
 #endif // wxUSE_SLIDER
 
 
 #endif // wxUSE_SLIDER
 

-class WXDLLEXPORT wxGenericColourDialog : public wxDialog
+class WXDLLIMPEXP_CORE wxGenericColourDialog : public wxDialog

 {
 public:
     wxGenericColourDialog();
     wxGenericColourDialog(wxWindow *parent,
 {
 public:
     wxGenericColourDialog();
     wxGenericColourDialog(wxWindow *parent,

-                          wxColourData *data = (wxColourData *) NULL);
+                          wxColourData *data = NULL);

     virtual ~wxGenericColourDialog();
 
     virtual ~wxGenericColourDialog();
 

-    bool Create(wxWindow *parent, wxColourData *data = (wxColourData *) NULL);
+    bool Create(wxWindow *parent, wxColourData *data = NULL);

 
     wxColourData &GetColourData() { return m_colourData; }
 
 
     wxColourData &GetColourData() { return m_colourData; }