preparation for allowing to use wxTimer in wxBase (heavily modified patch 1113088):

[wxWidgets.git] / include / wx / mac / carbon / colordlg.h

diff --git a/include/wx/mac/carbon/colordlg.h b/include/wx/mac/carbon/colordlg.h
index 1acae2b35bd9c087addfc4ca7319983ffc168686..402547bdf8a4d21de1154fdd1484b3f77f6b42f3 100644 (file)
--- a/include/wx/mac/carbon/colordlg.h
+++ b/include/wx/mac/carbon/colordlg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        colordlg.h
+// Name:        wx/mac/carbon/colordlg.h
 // Purpose:     wxColourDialog class. Use generic version if no
 //              platform-specific implementation.
 // Author:      Stefan Csomor
@@ -7,17 +7,13 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLORDLG_H_
 #define _WX_COLORDLG_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "colordlg.h"
-#endif
-
-#include "wx/setup.h"
+#include "wx/defs.h"
 #include "wx/dialog.h"
 #include "wx/cmndata.h"