From 3fde374f3fac99247452a7358b2b43802728a219 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 12 May 2002 22:26:01 +0000
Subject: [PATCH] fixes to wxFontDialog after recent changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/fontdlg.h     | 14 +++++++++-----
 include/wx/msw/fontdlg.h | 13 +++++++------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index f61331e1e5..d8b44cc69f 100644
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -28,13 +28,14 @@ class WXDLLEXPORT wxFontDialogBase : public wxDialog
 public:
     // create the font dialog
     wxFontDialogBase() { }
-    wxFontDialogBase(wxWindow *parent) { }
-    wxFontDialogBase(wxWindow *parent, const wxFontData& data) { }
+    wxFontDialogBase(wxWindow *parent) { m_parent = parent; }
+    wxFontDialogBase(wxWindow *parent, const wxFontData& data)
+        { m_parent = parent; InitFontData(&data); }
 
     bool Create(wxWindow *parent)
         { return DoCreate(parent); }
     bool Create(wxWindow *parent, const wxFontData& data)
-        { m_fontData = data; return Create(parent); }
+        { InitFontData(&data); return Create(parent); }
 
     virtual ~wxFontDialogBase();
 
@@ -44,14 +45,17 @@ public:
 
     // deprecated interface, for compatibility only, don't use
     wxFontDialogBase(wxWindow *parent, const wxFontData *data)
-        { Init(); Create(parent, data); }
+        { m_parent = parent; InitFontData(data); }
 
     bool Create(wxWindow *parent, const wxFontData *data)
-        { if ( data ) m_fontData = *data; return Create(parent); }
+        { InitFontData(data); return Create(parent); }
 
 protected:
     virtual bool DoCreate(wxWindow *parent) { m_parent = parent; return TRUE; }
 
+    void InitFontData(const wxFontData *data = NULL)
+        { if ( data ) m_fontData = *data; }
+
     wxFontData m_fontData;
 };
 
diff --git a/include/wx/msw/fontdlg.h b/include/wx/msw/fontdlg.h
index 2114a3f55a..cc5d046254 100644
--- a/include/wx/msw/fontdlg.h
+++ b/include/wx/msw/fontdlg.h
@@ -23,16 +23,17 @@
 class WXDLLEXPORT wxFontDialog : public wxFontDialogBase
 {
 public:
-    wxFontDialog() : wxFontDialogBase() { }
-    wxFontDialog(wxWindow *parent) : wxFontDialogBase(parent) { }
+    wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ }
+    wxFontDialog(wxWindow *parent)
+        : wxFontDialogBase(parent) { Create(parent); }
     wxFontDialog(wxWindow *parent, const wxFontData& data)
-        : wxFontDialogBase(parent, data) { }
+        : wxFontDialogBase(parent, data) { Create(parent, data); }
 
     virtual int ShowModal();
 
-    // deprecated
-    wxFontDialog(wxWindow *parent, wxFontData *data)
-        : wxFontDialogBase(parent, data) { }
+    // deprecated interface, don't use
+    wxFontDialog(wxWindow *parent, const wxFontData *data)
+        : wxFontDialogBase(parent, data) { Create(parent, data); }
 
 protected:
     DECLARE_DYNAMIC_CLASS(wxFontDialog)
-- 
2.45.2