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

diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h
index 59c87eacff890a3778fb949bcaf2405a6d7e11fa..742bf813ef5825fa4564a2ad1f43f197b2edce9a 100644 (file)
--- a/include/wx/generic/fontdlgg.h
+++ b/include/wx/generic/fontdlgg.h
@@ -59,10 +59,10 @@ class WXDLLEXPORT wxGenericFontDialog: public wxDialog
  public:
  
   wxGenericFontDialog(void);
  public:
  
   wxGenericFontDialog(void);

-  wxGenericFontDialog(wxWindow *parent, wxFontData *data = (wxFontData *) NULL);
+  wxGenericFontDialog(wxWindow *parent, const wxFontData& data);

   ~wxGenericFontDialog(void);
 
   ~wxGenericFontDialog(void);
 

-  bool Create(wxWindow *parent, wxFontData *data = (wxFontData *) NULL);
+  bool Create(wxWindow *parent, const wxFontData& data);

 
   int ShowModal(void);
 
 
   int ShowModal(void);
 

diff --git a/include/wx/mac/fontdlg.h b/include/wx/mac/fontdlg.h
index 39da6fd9675d58e8f86f95e4d03be8bf482a2ef0..99fdbcb93fed7d228394b10cb458e1146b3b3131 100644 (file)
--- 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();
 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; }
 
     int ShowModal();
     wxFontData& GetFontData() { return m_fontData; }

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index c976d72af6b753263a543c1e352f7f7225d8bf99..6c591571f0a68feef889f96a2f88ec71c291f008 100644 (file)
--- 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;
             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();
             if ( dialog.ShowModal() == wxID_OK )
             {
                 wxFontData retData = dialog.GetFontData();

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 92dabe4d64811f59f925758ed7a8ac76c6810ac1..71958c6fc2f6fe2324d7a03e4343d0dc2b8903c5 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -1002,7 +1002,7 @@ wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit)
     }
 
     wxFont fontRet;
     }
 
     wxFont fontRet;

-    wxFontDialog dialog(parent, &data);
+    wxFontDialog dialog(parent, data);

     if ( dialog.ShowModal() == wxID_OK )
     {
         fontRet = dialog.GetFontData().GetChosenFont();
     if ( dialog.ShowModal() == wxID_OK )
     {
         fontRet = dialog.GetFontData().GetChosenFont();

diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp
index b7a8f3be4e7b22686233eb30f104bfcc0331d731..c9f46c7f5ea3d918910cffd8fa4241243db77e30 100644 (file)
--- a/src/generic/fontdlgg.cpp
+++ b/src/generic/fontdlgg.cpp
@@ -170,7 +170,7 @@ wxGenericFontDialog::wxGenericFontDialog(void)
   dialogParent = NULL;
 }
 
   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)
 {
   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);
 }
 
   EndModal(wxID_CANCEL);
 }
 

-bool wxGenericFontDialog::Create(wxWindow *parent, wxFontData *data)
+bool wxGenericFontDialog::Create(wxWindow *parent, const wxFontData& data)

 {
   dialogParent = parent;
 
 {
   dialogParent = parent;
 

-  if (data)
-    fontData = *data;
+  fontData = data;

 
   InitializeFont();
   CreateWidgets();
 
   InitializeFont();
   CreateWidgets();

diff --git a/src/mac/carbon/fontdlg.cpp b/src/mac/carbon/fontdlg.cpp
index d775c24c169eeefdea89bd141b3df424f2226783..e7875df4f50aa119b2ae958a4c3d23d060b92f77 100644 (file)
--- a/src/mac/carbon/fontdlg.cpp
+++ b/src/mac/carbon/fontdlg.cpp
@@ -30,17 +30,16 @@ wxFontDialog::wxFontDialog()
     m_dialogParent = NULL;
 }
 
     m_dialogParent = NULL;
 }
 

-wxFontDialog::wxFontDialog(wxWindow *parent, wxFontData *data)
+wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData&  data)

 {
     Create(parent, data);
 }
 
 {
     Create(parent, data);
 }
 

-bool wxFontDialog::Create(wxWindow *parent, wxFontData *data)
+bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data)

 {
     m_dialogParent = parent;
 
 {
     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.
 
     // 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 d775c24c169eeefdea89bd141b3df424f2226783..e7875df4f50aa119b2ae958a4c3d23d060b92f77 100644 (file)
--- a/src/mac/fontdlg.cpp
+++ b/src/mac/fontdlg.cpp
@@ -30,17 +30,16 @@ wxFontDialog::wxFontDialog()
     m_dialogParent = NULL;
 }
 
     m_dialogParent = NULL;
 }
 

-wxFontDialog::wxFontDialog(wxWindow *parent, wxFontData *data)
+wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData&  data)

 {
     Create(parent, data);
 }
 
 {
     Create(parent, data);
 }
 

-bool wxFontDialog::Create(wxWindow *parent, wxFontData *data)
+bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data)

 {
     m_dialogParent = parent;
 
 {
     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.
 
     // TODO: you may need to do dialog creation here, unless it's
     // done in ShowModal.