reverted Julian's unintentional breakage of wxChoice

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

diff --git a/include/wx/msw/colordlg.h b/include/wx/msw/colordlg.h
index 09cd225e90f2dccd1ff8f9affeb82fe7acba0996..cf93a514efd0ed7de6f4926bdb44b6a215925f7d 100644 (file)
--- a/include/wx/msw/colordlg.h
+++ b/include/wx/msw/colordlg.h
@@ -1,16 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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 and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __COLORDLGH__
-#define __COLORDLGH__
+#ifndef _WX_COLORDLG_H_
+#define _WX_COLORDLG_H_
 
 #ifdef __GNUG__
 #pragma interface "colordlg.h"
@@ -20,25 +20,38 @@
 #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)
- protected:
-  wxColourData colourData;
-  wxWindow *dialogParent;
- public:
-  wxColourDialog(void);
-  wxColourDialog(wxWindow *parent, wxColourData *data = NULL);
-
-  bool Create(wxWindow *parent, wxColourData *data = NULL);
-
-  int ShowModal(void);
-  wxColourData& GetColourData(void) { return colourData; }
+public:
+    wxColourDialog();
+    wxColourDialog(wxWindow *parent, wxColourData *data = NULL);
+
+    bool Create(wxWindow *parent, wxColourData *data = NULL);
+
+    wxColourData& GetColourData() { return m_colourData; }
+
+    // override some base class virtuals
+    virtual void SetTitle(const wxString& title);
+    virtual wxString GetTitle();
+
+    virtual int ShowModal();
+
+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;
+    wxString            m_title;
+
+    DECLARE_DYNAMIC_CLASS(wxColourDialog)
 };
 
 #endif
-    // __COLORDLGH__
+    // _WX_COLORDLG_H_