avoid setting initial position if it was not specified, broken in r70734

[wxWidgets.git] / src / osx / carbon / fontdlgosx.mm

diff --git a/src/osx/carbon/fontdlgosx.mm b/src/osx/carbon/fontdlgosx.mm
index 2d42537db7fb0df016f46093dcd711e68cdecbf0..2129527f3e9f38f952a0b4b5b92c26d2a5de97a2 100644 (file)
--- a/src/osx/carbon/fontdlgosx.mm
+++ b/src/osx/carbon/fontdlgosx.mm
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton
 // Modified by:
 // Created:     2004-10-03
 // Author:      Ryan Norton
 // Modified by:
 // Created:     2004-10-03

-// RCS-ID:      $Id$

 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -28,6 +27,7 @@
 #endif
 
 #include "wx/fontutil.h"
 #endif
 
 #include "wx/fontutil.h"

+#include "wx/modalhook.h"

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -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];


@@ -419,6 +434,8 @@ bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data)
 
 int wxFontDialog::ShowModal()
 {
 
 int wxFontDialog::ShowModal()
 {

+    WX_HOOK_MODAL_DIALOG();
+

     //Start the pool.  Required for carbon interaction
     //(For those curious, the only thing that happens
     //if you don't do this is a bunch of error
     //Start the pool.  Required for carbon interaction
     //(For those curious, the only thing that happens
     //if you don't do this is a bunch of error