Fix memory leak by letting the base class version handle the

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

diff --git a/include/wx/msw/colordlg.h b/include/wx/msw/colordlg.h
index cf93a514efd0ed7de6f4926bdb44b6a215925f7d..1432a0dedc14c73cdb84cdea6d7835ff57b6583d 100644 (file)
--- a/include/wx/msw/colordlg.h
+++ b/include/wx/msw/colordlg.h
@@ -6,13 +6,13 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #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