X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..2d73b710e1fb5d1e99b4bdbcbdbf301d3bce1bc2:/include/wx/msw/colordlg.h diff --git a/include/wx/msw/colordlg.h b/include/wx/msw/colordlg.h index cf93a514ef..1f6679b8b9 100644 --- a/include/wx/msw/colordlg.h +++ b/include/wx/msw/colordlg.h @@ -12,7 +12,7 @@ #ifndef _WX_COLORDLG_H_ #define _WX_COLORDLG_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "colordlg.h" #endif @@ -36,10 +36,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 DoGetSize(int *width, int *height) const; virtual void DoGetClientSize(int *width, int *height) const; @@ -50,7 +52,9 @@ protected: wxColourData m_colourData; wxString m_title; - DECLARE_DYNAMIC_CLASS(wxColourDialog) + wxPoint m_pos; + + DECLARE_DYNAMIC_CLASS_NO_COPY(wxColourDialog) }; #endif