From baaae89f09ece7ab8a17570ee535683b9d14aeda Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Sat, 18 May 2002 11:05:58 +0000
Subject: [PATCH] Updated font dialog constructors to use a reference to the
 font data as per more recent convention

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/generic/fontdlgg.h | 4 ++--
 include/wx/mac/fontdlg.h      | 4 ++--
 src/common/fontmap.cpp        | 2 +-
 src/common/utilscmn.cpp       | 2 +-
 src/generic/fontdlgg.cpp      | 7 +++----
 src/mac/carbon/fontdlg.cpp    | 7 +++----
 src/mac/fontdlg.cpp           | 7 +++----
 7 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h
index 59c87eacff..742bf813ef 100644
--- a/include/wx/generic/fontdlgg.h
+++ b/include/wx/generic/fontdlgg.h
@@ -59,10 +59,10 @@ class WXDLLEXPORT wxGenericFontDialog: public wxDialog
  public:
  
   wxGenericFontDialog(void);
-  wxGenericFontDialog(wxWindow *parent, wxFontData *data = (wxFontData *) NULL);
+  wxGenericFontDialog(wxWindow *parent, const wxFontData& data);
   ~wxGenericFontDialog(void);
 
-  bool Create(wxWindow *parent, wxFontData *data = (wxFontData *) NULL);
+  bool Create(wxWindow *parent, const wxFontData& data);
 
   int ShowModal(void);
 
diff --git a/include/wx/mac/fontdlg.h b/include/wx/mac/fontdlg.h
index 39da6fd967..99fdbcb93f 100644
--- a/include/wx/mac/fontdlg.h
+++ b/include/wx/mac/fontdlg.h
@@ -29,9 +29,9 @@ class WXDLLEXPORT wxFontDialog: public wxDialog
 DECLARE_DYNAMIC_CLASS(wxFontDialog)
 public:
     wxFontDialog();
-    wxFontDialog(wxWindow *parent, wxFontData *data = NULL);
+    wxFontDialog(wxWindow *parent, const wxFontData& data);
 
-    bool Create(wxWindow *parent, wxFontData *data = NULL);
+    bool Create(wxWindow *parent, const wxFontData& data);
 
     int ShowModal();
     wxFontData& GetFontData() { return m_fontData; }
diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index c976d72af6..6c591571f0 100644
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -882,7 +882,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
             wxFontData data;
             data.SetEncoding(encoding);
             data.EncodingInfo() = *info;
-            wxFontDialog dialog(m_windowParent, &data);
+            wxFontDialog dialog(m_windowParent, data);
             if ( dialog.ShowModal() == wxID_OK )
             {
                 wxFontData retData = dialog.GetFontData();
diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 92dabe4d64..71958c6fc2 100644
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -1002,7 +1002,7 @@ wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit)
     }
 
     wxFont fontRet;
-    wxFontDialog dialog(parent, &data);
+    wxFontDialog dialog(parent, data);
     if ( dialog.ShowModal() == wxID_OK )
     {
         fontRet = dialog.GetFontData().GetChosenFont();
diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp
index b7a8f3be4e..c9f46c7f5e 100644
--- a/src/generic/fontdlgg.cpp
+++ b/src/generic/fontdlgg.cpp
@@ -170,7 +170,7 @@ wxGenericFontDialog::wxGenericFontDialog(void)
   dialogParent = NULL;
 }
 
-wxGenericFontDialog::wxGenericFontDialog(wxWindow *parent, wxFontData *data):
+wxGenericFontDialog::wxGenericFontDialog(wxWindow *parent, const wxFontData& data):
   wxDialog(parent, -1, _("Font"), wxDefaultPosition, wxDefaultSize,
            wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL|wxRESIZE_BORDER)
 {
@@ -188,12 +188,11 @@ void wxGenericFontDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
   EndModal(wxID_CANCEL);
 }
 
-bool wxGenericFontDialog::Create(wxWindow *parent, wxFontData *data)
+bool wxGenericFontDialog::Create(wxWindow *parent, const wxFontData& data)
 {
   dialogParent = parent;
 
-  if (data)
-    fontData = *data;
+  fontData = data;
 
   InitializeFont();
   CreateWidgets();
diff --git a/src/mac/carbon/fontdlg.cpp b/src/mac/carbon/fontdlg.cpp
index d775c24c16..e7875df4f5 100644
--- a/src/mac/carbon/fontdlg.cpp
+++ b/src/mac/carbon/fontdlg.cpp
@@ -30,17 +30,16 @@ wxFontDialog::wxFontDialog()
     m_dialogParent = NULL;
 }
 
-wxFontDialog::wxFontDialog(wxWindow *parent, wxFontData *data)
+wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData&  data)
 {
     Create(parent, data);
 }
 
-bool wxFontDialog::Create(wxWindow *parent, wxFontData *data)
+bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data)
 {
     m_dialogParent = parent;
 
-    if (data)
-        m_fontData = *data;
+    m_fontData = data;
 
     // TODO: you may need to do dialog creation here, unless it's
     // done in ShowModal.
diff --git a/src/mac/fontdlg.cpp b/src/mac/fontdlg.cpp
index d775c24c16..e7875df4f5 100644
--- a/src/mac/fontdlg.cpp
+++ b/src/mac/fontdlg.cpp
@@ -30,17 +30,16 @@ wxFontDialog::wxFontDialog()
     m_dialogParent = NULL;
 }
 
-wxFontDialog::wxFontDialog(wxWindow *parent, wxFontData *data)
+wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData&  data)
 {
     Create(parent, data);
 }
 
-bool wxFontDialog::Create(wxWindow *parent, wxFontData *data)
+bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data)
 {
     m_dialogParent = parent;
 
-    if (data)
-        m_fontData = *data;
+    m_fontData = data;
 
     // TODO: you may need to do dialog creation here, unless it's
     // done in ShowModal.
-- 
2.45.2