no changes, just remove #if'd out code

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

diff --git a/include/wx/gtk/colordlg.h b/include/wx/gtk/colordlg.h
index 84f3e6b4132ae44368e4a15d299c9950d23e064c..0b78f691b3514a07b78e486556a0c657e4b7130c 100644 (file)
--- a/include/wx/gtk/colordlg.h
+++ b/include/wx/gtk/colordlg.h
@@ -9,24 +9,21 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __COLORDLG_H__
-#define __COLORDLG_H__
+#ifndef _WX_GTK_COLORDLG_H_
+#define _WX_GTK_COLORDLG_H_

 
 

-#include "wx/defs.h"
-#include "wx/gdicmn.h"

 #include "wx/dialog.h"
 #include "wx/cmndata.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; }