X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/274ad000d2eec40f0af7d2c40940aeece00765d3..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/gtk1/colordlg.h diff --git a/include/wx/gtk1/colordlg.h b/include/wx/gtk1/colordlg.h index 9db85c55a2..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; } @@ -39,15 +34,16 @@ public: protected: // implement some base class methods to do nothing to avoid asserts and // GTK warnings, since this is not a real wxDialog. - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO) {} - virtual void DoMoveWindow(int x, int y, int width, int height) {} + virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), + int WXUNUSED(width), int WXUNUSED(height), + int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {} + virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), + int WXUNUSED(width), int WXUNUSED(height)) {} // copy data between the dialog and m_colourData: void ColourDataToDialog(); void DialogToColourData(); - + wxColourData m_data; DECLARE_DYNAMIC_CLASS(wxColourDialog)