X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3db7220e05a2197d27adf72ce5e52a037fe49670..75ded4d17344618afd302a0671f1277791ee17ed:/include/wx/gtk1/colordlg.h diff --git a/include/wx/gtk1/colordlg.h b/include/wx/gtk1/colordlg.h index 3eb2f3afc7..d686d0cec9 100644 --- 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: @@ -12,25 +12,20 @@ #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" -class WXDLLEXPORT wxColourDialog : public wxDialog +class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog { public: wxColourDialog() {} wxColourDialog(wxWindow *parent, - wxColourData *data = (wxColourData *)NULL); + wxColourData *data = NULL); virtual ~wxColourDialog() {} - bool Create(wxWindow *parent, wxColourData *data = (wxColourData *)NULL); + bool Create(wxWindow *parent, wxColourData *data = NULL); wxColourData &GetColourData() { return m_data; } @@ -48,7 +43,7 @@ protected: // copy data between the dialog and m_colourData: void ColourDataToDialog(); void DialogToColourData(); - + wxColourData m_data; DECLARE_DYNAMIC_CLASS(wxColourDialog)