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 5643ef6f2f32b3e1a86133ce4f2a1211121db405..1f6679b8b9717b5b732d8f3195421cb19fbd59f2 100644 (file)
--- a/include/wx/msw/colordlg.h
+++ b/include/wx/msw/colordlg.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        colordlg.h
+// Name:        wx/msw/colordlg.h
 // Purpose:     wxColourDialog class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLORDLG_H_
 #define _WX_COLORDLG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "colordlg.h"
 #endif
 
@@ -20,25 +20,41 @@
 #include "wx/dialog.h"
 #include "wx/cmndata.h"
 
-/*
- * COLOUR DIALOG
- */
+// ----------------------------------------------------------------------------
+// wxColourDialog: dialog for choosing a colours
+// ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxColourDialog: public wxDialog
+class WXDLLEXPORT wxColourDialog : public wxDialog
 {
-DECLARE_DYNAMIC_CLASS(wxColourDialog)
 public:
-    wxColourDialog(void);
+    wxColourDialog();
     wxColourDialog(wxWindow *parent, wxColourData *data = NULL);
 
     bool Create(wxWindow *parent, wxColourData *data = NULL);
 
-    int ShowModal(void);
-    wxColourData& GetColourData(void) { return m_colourData; }
+    wxColourData& GetColourData() { return m_colourData; }
+
+    // override some base class virtuals
+    virtual void SetTitle(const wxString& title);
+    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;
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+
     wxColourData        m_colourData;
-    wxWindow*           m_dialogParent;
+    wxString            m_title;
+
+    wxPoint             m_pos;
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxColourDialog)
 };
 
 #endif