X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f63e3ebbe3272b9690aa2530e0c3048d3f37c7c7..3ac1094bead05e30462122d00e4859725d2ea59f:/include/wx/msw/colordlg.h diff --git a/include/wx/msw/colordlg.h b/include/wx/msw/colordlg.h index b56207bf7c..621ebcaa23 100644 --- a/include/wx/msw/colordlg.h +++ b/include/wx/msw/colordlg.h @@ -12,11 +12,7 @@ #ifndef _WX_COLORDLG_H_ #define _WX_COLORDLG_H_ -#ifdef __GNUG__ -#pragma interface "colordlg.h" -#endif - -#include "wx/setup.h" +#include "wx/defs.h" #include "wx/dialog.h" #include "wx/cmndata.h" @@ -36,13 +32,12 @@ public: // override some base class virtuals virtual void SetTitle(const wxString& title); - virtual wxString GetTitle(); + virtual wxString GetTitle() const; virtual int ShowModal(); - virtual void DoGetPosition( int *x, int *y ) const; - protected: + virtual void DoGetPosition( int *x, int *y ) const; virtual void DoGetSize(int *width, int *height) const; virtual void DoGetClientSize(int *width, int *height) const; virtual void DoSetSize(int x, int y, @@ -54,7 +49,7 @@ protected: wxPoint m_pos; - DECLARE_DYNAMIC_CLASS(wxColourDialog) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxColourDialog) }; #endif