Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / gtk1 / colordlg.h

diff --git a/include/wx/gtk1/colordlg.h b/include/wx/gtk1/colordlg.h
index 5da29e6af3468d7855a20ad3182d6ed3c80db798..d686d0cec9d2f0522fd097ee0cb2c1d0c58449bf 100644 (file)
--- a/include/wx/gtk1/colordlg.h
+++ b/include/wx/gtk1/colordlg.h
@@ -15,7 +15,6 @@
 #include "wx/defs.h"
 #include "wx/gdicmn.h"
 #include "wx/dialog.h"
-#include "wx/cmndata.h"
 
 
 class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog
@@ -23,10 +22,10 @@ class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog
 public:
     wxColourDialog() {}
     wxColourDialog(wxWindow *parent,
-                   wxColourData *data = (wxColourData *)NULL);
+                   wxColourData *data = NULL);
     virtual ~wxColourDialog() {}
 
-    bool Create(wxWindow *parent, wxColourData *data = (wxColourData *)NULL);
+    bool Create(wxWindow *parent, wxColourData *data = NULL);
 
     wxColourData &GetColourData() { return m_data; }