Further performance optimizations

[wxWidgets.git] / include / wx / fontdlg.h

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index da2fba946d41f7b896619d5526edf1b4c48fda42..dfeacdc4d79b5a859afc7944d677119d98e9ce53 100644 (file)
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -23,7 +23,7 @@
 // wxFontDialog interface
 // ----------------------------------------------------------------------------
 
 // wxFontDialog interface
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFontDialogBase : public wxDialog
+class WXDLLIMPEXP_CORE wxFontDialogBase : public wxDialog

 {
 public:
     // create the font dialog
 {
 public:
     // create the font dialog


@@ -74,9 +74,9 @@ inline bool wxFontDialogBase::Create(wxWindow *parent, const wxFontData *data)
 // platform-specific wxFontDialog implementation
 // ----------------------------------------------------------------------------
 
 // platform-specific wxFontDialog implementation
 // ----------------------------------------------------------------------------
 

-#if defined( __WXMAC_OSX__ ) && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
+#if defined( __WXMAC_OSX__ )

 //set to 1 to use native mac font and color dialogs
 //set to 1 to use native mac font and color dialogs

-#define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 0
+#define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 1

 #else
 //not supported on these platforms, leave 0
 #define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 0
 #else
 //not supported on these platforms, leave 0
 #define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 0


@@ -108,9 +108,9 @@ inline bool wxFontDialogBase::Create(wxWindow *parent, const wxFontData *data)
 
 // get the font from user and return it, returns wxNullFont if the dialog was
 // cancelled
 
 // get the font from user and return it, returns wxNullFont if the dialog was
 // cancelled

-wxFont WXDLLEXPORT
-wxGetFontFromUser(wxWindow *parent = (wxWindow *)NULL,
-                  const wxFont& fontInit = wxNullFont, const wxString& caption = wxEmptyString);
+WXDLLIMPEXP_CORE wxFont wxGetFontFromUser(wxWindow *parent = (wxWindow *)NULL,
+                                          const wxFont& fontInit = wxNullFont,
+                                          const wxString& caption = wxEmptyString);

 
 #endif // wxUSE_FONTDLG
 
 
 #endif // wxUSE_FONTDLG