correct access for virtuals

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

diff --git a/include/wx/msw/fontdlg.h b/include/wx/msw/fontdlg.h
index 9ef6c77751b610b32617aa8933225cb18e8d7574..92d6078b4525cfaef41dfb24e3c4bef4c7f6c0d6 100644 (file)
--- a/include/wx/msw/fontdlg.h
+++ b/include/wx/msw/fontdlg.h
@@ -1,44 +1,46 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        fontdlg.h
+// Name:        wx/msw/fontdlg.h
 // Purpose:     wxFontDialog 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 __FONTDLGH__
-#define __FONTDLGH__
+#ifndef _WX_MSW_FONTDLG_H_
+#define _WX_MSW_FONTDLG_H_
 
-#ifdef __GNUG__
-#pragma interface "fontdlg.h"
-#endif
-
-#include "wx/dialog.h"
-#include "wx/cmndata.h"
+// ----------------------------------------------------------------------------
+// wxFontDialog
+// ----------------------------------------------------------------------------
 
-/*
- * FONT DIALOG
- */
- 
-class WXDLLEXPORT wxFontDialog: public wxDialog
+class WXDLLEXPORT wxFontDialog : public wxFontDialogBase
 {
- DECLARE_DYNAMIC_CLASS(wxFontDialog)
- protected:
-  wxWindow *dialogParent;
-  wxFontData fontData;
- public:
-  wxFontDialog(void);
-  wxFontDialog(wxWindow *parent, wxFontData *data = NULL);
-
-  bool Create(wxWindow *parent, wxFontData *data = NULL);
-
-  int ShowModal(void);
-  wxFontData& GetFontData(void) { return fontData; }
+public:
+    wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ }
+    wxFontDialog(wxWindow *parent)
+        : wxFontDialogBase(parent) { Create(parent); }
+    wxFontDialog(wxWindow *parent, const wxFontData& data)
+        : wxFontDialogBase(parent, data) { Create(parent, data); }
+
+    virtual int ShowModal();
+
+#if WXWIN_COMPATIBILITY_2_6
+    // deprecated interface, don't use
+    wxDEPRECATED( wxFontDialog(wxWindow *parent, const wxFontData *data) );
+#endif // WXWIN_COMPATIBILITY_2_6
+
+protected:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxFontDialog)
 };
 
-#endif
-    // __FONTDLGH__
+#if WXWIN_COMPATIBILITY_2_6
+    // deprecated interface, don't use
+inline wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData *data)
+        : wxFontDialogBase(parent) { InitFontData(data); Create(parent); }
+#endif // WXWIN_COMPATIBILITY_2_6
 
+#endif
+    // _WX_MSW_FONTDLG_H_