allowing shaped windows again

[wxWidgets.git] / src / mac / carbon / fontdlg.cpp

diff --git a/src/mac/carbon/fontdlg.cpp b/src/mac/carbon/fontdlg.cpp
index d775c24c169eeefdea89bd141b3df424f2226783..03c894c553ad13863823f1d986cb9ec31abe7957 100644 (file)
--- a/src/mac/carbon/fontdlg.cpp
+++ b/src/mac/carbon/fontdlg.cpp
@@ -2,12 +2,12 @@
 // Name:        fontdlg.cpp
 // Purpose:     wxFontDialog class. NOTE: you can use the generic class
 //              if you wish, instead of implementing this.
 // Name:        fontdlg.cpp
 // Purpose:     wxFontDialog class. NOTE: you can use the generic class
 //              if you wish, instead of implementing this.

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -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.