Support diabling items in GTK+, see #12686: Allow disabling of wxDVC items

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

diff --git a/include/wx/gtk1/colordlg.h b/include/wx/gtk1/colordlg.h
index 3eb2f3afc727322a3f1050101f2cfbe7f6c098e1..ed07836ef24050f74b142ce52a2f1b655962048f 100644 (file)
--- a/include/wx/gtk1/colordlg.h
+++ b/include/wx/gtk1/colordlg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/gtk/colordlg.h
+// Name:        wx/gtk1/colordlg.h

 // Purpose:     wxColourDialog
 // Author:      Vaclav Slavik
 // Modified by:
 // Purpose:     wxColourDialog
 // Author:      Vaclav Slavik
 // Modified by:


@@ -12,25 +12,21 @@
 #ifndef __COLORDLG_H__
 #define __COLORDLG_H__
 
 #ifndef __COLORDLG_H__
 #define __COLORDLG_H__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "colordlg.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"
 
 

-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; }
 


@@ -48,7 +44,7 @@ protected:
     // copy data between the dialog and m_colourData:
     void ColourDataToDialog();
     void DialogToColourData();
     // copy data between the dialog and m_colourData:
     void ColourDataToDialog();
     void DialogToColourData();

-    
+

     wxColourData m_data;
 
     DECLARE_DYNAMIC_CLASS(wxColourDialog)
     wxColourData m_data;
 
     DECLARE_DYNAMIC_CLASS(wxColourDialog)