make wxDateTime::ParseXXX() functions char*-friendly

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

diff --git a/include/wx/gtk/colordlg.h b/include/wx/gtk/colordlg.h
index 3eb2f3afc727322a3f1050101f2cfbe7f6c098e1..121477410fece60a16e957dec24f297729b51f45 100644 (file)
--- a/include/wx/gtk/colordlg.h
+++ b/include/wx/gtk/colordlg.h
@@ -9,19 +9,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __COLORDLG_H__
-#define __COLORDLG_H__
+#ifndef _WX_GTK_COLORDLG_H_
+#define _WX_GTK_COLORDLG_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "colordlg.h"
-#endif
-
-#include "wx/setup.h"
-#include "wx/gdicmn.h"
 #include "wx/dialog.h"
 #include "wx/cmndata.h"
 
-
 class WXDLLEXPORT wxColourDialog : public wxDialog
 {
 public:
@@ -48,7 +41,7 @@ protected:
     // copy data between the dialog and m_colourData:
     void ColourDataToDialog();
     void DialogToColourData();
-    
+
     wxColourData m_data;
 
     DECLARE_DYNAMIC_CLASS(wxColourDialog)