Restore compilation with --enable-stl, fix SetFocus with the generic control, and...

[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 443ba6fd685e722d3e29d66f0bf96908e99d7fd5..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
@@ -13,11 +13,7 @@
 #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"