Add wxFontDialog ctor not taking wxFontData to wxOSX.

wxFontDialog should have ctor and Create() overload taking just wxWindow
parent in addition to the one taking parent and wxFontData used to initialize
the dialog but it didn't have them in wxOSX, do add them now.

Closes #13908.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/osx/fontdlg.h b/include/wx/osx/fontdlg.h
index 90ec73f54f6a6926239f4700d3d0d0e1872d5359..0eaa5150642dd0779927d863388f3c160aba6147 100644 (file)
--- a/include/wx/osx/fontdlg.h
+++ b/include/wx/osx/fontdlg.h
@@ -35,9 +35,11 @@ class WXDLLIMPEXP_CORE wxFontDialog : public wxDialog
 {
 public:
     wxFontDialog();
 {
 public:
     wxFontDialog();

+    wxFontDialog(wxWindow *parent);

     wxFontDialog(wxWindow *parent, const wxFontData& data);
     virtual ~wxFontDialog();
 
     wxFontDialog(wxWindow *parent, const wxFontData& data);
     virtual ~wxFontDialog();
 

+    bool Create(wxWindow *parent);

     bool Create(wxWindow *parent, const wxFontData& data);
 
     int ShowModal();
     bool Create(wxWindow *parent, const wxFontData& data);
 
     int ShowModal();

diff --git a/src/osx/carbon/fontdlg.cpp b/src/osx/carbon/fontdlg.cpp
index 80c103c46f0fb30b5d04925b27fe4343334e609b..3ec1fde81e8597fe32727332127a4e5184ce94e9 100644 (file)
--- a/src/osx/carbon/fontdlg.cpp
+++ b/src/osx/carbon/fontdlg.cpp
@@ -202,6 +202,11 @@ wxFontDialog::wxFontDialog()
 {
 }
 
 {
 }
 

+wxFontDialog::wxFontDialog(wxWindow *parent)
+{
+    Create(parent);
+}
+

 wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData&  data)
 {
     Create(parent, data);
 wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData&  data)
 {
     Create(parent, data);


@@ -211,12 +216,17 @@ wxFontDialog::~wxFontDialog()
 {
 }
 
 {
 }
 

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

 {
 {

-    m_fontData = data;

     return true ;
 }
 
     return true ;
 }
 

+bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data)
+{
+    m_fontData = data;
+    return Create(parent) ;
+}
+

 int wxFontDialog::ShowModal()
 {
 #if wxOSX_USE_CARBON
 int wxFontDialog::ShowModal()
 {
 #if wxOSX_USE_CARBON

diff --git a/src/osx/carbon/fontdlgosx.mm b/src/osx/carbon/fontdlgosx.mm
index 2d42537db7fb0df016f46093dcd711e68cdecbf0..6c2ab56c81a3e5a25b92f3c9e1c117ece1a26267 100644 (file)
--- a/src/osx/carbon/fontdlgosx.mm
+++ b/src/osx/carbon/fontdlgosx.mm
@@ -351,6 +351,11 @@ wxFontDialog::wxFontDialog()
 {
 }
 
 {
 }
 

+wxFontDialog::wxFontDialog(wxWindow *parent)
+{
+    Create(parent);
+}
+

 wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData&  data)
 {
     Create(parent, data);
 wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData&  data)
 {
     Create(parent, data);


@@ -360,10 +365,20 @@ wxFontDialog::~wxFontDialog()
 {
 }
 
 {
 }
 

+bool wxFontDialog::Create(wxWindow *parent)
+{
+    return Create(parent);
+}
+

 bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data)
 {
     m_fontData = data;
 
 bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data)
 {
     m_fontData = data;
 

+    return Create(parent);
+}
+
+bool wxFontDialog::Create(wxWindow *parent)
+{

     //autorelease pool - req'd for carbon
     NSAutoreleasePool *thePool;
     thePool = [[NSAutoreleasePool alloc] init];
     //autorelease pool - req'd for carbon
     NSAutoreleasePool *thePool;
     thePool = [[NSAutoreleasePool alloc] init];