Modified form of Patch #1611222, adds wxSearchCtrl (generic & native carbon HISearchF...

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

diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h
index 8e80019d78b127fb61ee62b9e6719277f7338666..06feb75ffab0a40b8d5ac46430e12ec46c6f9aa3 100644 (file)
--- a/include/wx/generic/colrdlgg.h
+++ b/include/wx/generic/colrdlgg.h
@@ -5,18 +5,14 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c)
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __COLORDLGH_G__
 #define __COLORDLGH_G__
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __COLORDLGH_G__
 #define __COLORDLGH_G__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "colrdlgg.h"
-#endif
-
-#include "wx/setup.h"
+#include "wx/defs.h"

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