cleanup - reformatting; simplified OnPaint

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

diff --git a/src/mac/carbon/fontdlg.cpp b/src/mac/carbon/fontdlg.cpp
index e2f20113dc796e67b14895db3b9da0a82c642311..382bd5d35f64c21fa8ce213476c6f3802d2965fe 100644 (file)
--- a/src/mac/carbon/fontdlg.cpp
+++ b/src/mac/carbon/fontdlg.cpp
@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#ifdef __GNUG__
-#pragma implementation "fontdlg.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -37,9 +33,11 @@
 
 #if !USE_NATIVE_FONT_DIALOG_FOR_MACOSX
 
-#if !USE_SHARED_LIBRARY
+#undef wxFontDialog
+
+#include "wx/mac/fontdlg.h"
+
 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
-#endif
 
 #include "wx/mac/private.h"
 
@@ -62,7 +60,7 @@ wxFontDialog::~wxFontDialog()
     // empty
 }
 
-void wxFontDialog::SetData(wxFontData& fontdata)
+void wxFontDialog::SetData(const wxFontData& fontdata)
 {
     m_fontData = fontdata;
 }
@@ -89,4 +87,4 @@ int wxFontDialog::ShowModal()
     return wxID_CANCEL;
 }
 
-#endif // 10.2+
\ No newline at end of file
+#endif // 10.2+