Use /bin/echo for creation of Mac OS X PkgInfo files.

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

diff --git a/include/wx/gtk1/colordlg.h b/include/wx/gtk1/colordlg.h
index 5c20ca2e627b0de839c7f26887bb8142199ad732..d686d0cec9d2f0522fd097ee0cb2c1d0c58449bf 100644 (file)
--- a/include/wx/gtk1/colordlg.h
+++ b/include/wx/gtk1/colordlg.h
@@ -12,21 +12,20 @@
 #ifndef __COLORDLG_H__
 #define __COLORDLG_H__
 
 #ifndef __COLORDLG_H__
 #define __COLORDLG_H__
 

-#include "wx/setup.h"
+#include "wx/defs.h"

 #include "wx/gdicmn.h"
 #include "wx/dialog.h"
 #include "wx/gdicmn.h"
 #include "wx/dialog.h"

-#include "wx/cmndata.h"

 
 
 
 

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

 {
 public:
     wxColourDialog() {}
     wxColourDialog(wxWindow *parent,
 {
 public:
     wxColourDialog() {}
     wxColourDialog(wxWindow *parent,

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

     virtual ~wxColourDialog() {}
 
     virtual ~wxColourDialog() {}
 

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

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