have it work the old way with PopupMenu(), and have it restore the old menu on destru...

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

diff --git a/include/wx/msw/colordlg.h b/include/wx/msw/colordlg.h
index b56207bf7c281c6e136841fd343fc96db57fec49..1f6679b8b9717b5b732d8f3195421cb19fbd59f2 100644 (file)
--- 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,7 +36,7 @@ public:
 
     // override some base class virtuals
     virtual void SetTitle(const wxString& title);
-    virtual wxString GetTitle();
+    virtual wxString GetTitle() const;
 
     virtual int ShowModal();
 
@@ -54,7 +54,7 @@ protected:
 
     wxPoint             m_pos;
 
-    DECLARE_DYNAMIC_CLASS(wxColourDialog)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxColourDialog)
 };
 
 #endif