X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..64c38b4be828b7b18f7d51f80eb9848f1cccf40e:/include/wx/fontdlg.h

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index dfeacdc4d7..5a2dca1195 100644
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -74,7 +74,7 @@ inline bool wxFontDialogBase::Create(wxWindow *parent, const wxFontData *data)
 // platform-specific wxFontDialog implementation
 // ----------------------------------------------------------------------------
 
-#if defined( __WXMAC_OSX__ )
+#if defined( __WXOSX_MAC__ )
 //set to 1 to use native mac font and color dialogs
 #define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 1
 #else
@@ -99,7 +99,7 @@ inline bool wxFontDialogBase::Create(wxWindow *parent, const wxFontData *data)
 #elif defined(__WXPM__)
     #include "wx/os2/fontdlg.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/fontdlg.h"
+    #include "wx/osx/fontdlg.h"
 #endif
 
 // ----------------------------------------------------------------------------
@@ -108,7 +108,7 @@ inline bool wxFontDialogBase::Create(wxWindow *parent, const wxFontData *data)
 
 // get the font from user and return it, returns wxNullFont if the dialog was
 // cancelled
-WXDLLIMPEXP_CORE wxFont wxGetFontFromUser(wxWindow *parent = (wxWindow *)NULL,
+WXDLLIMPEXP_CORE wxFont wxGetFontFromUser(wxWindow *parent = NULL,
                                           const wxFont& fontInit = wxNullFont,
                                           const wxString& caption = wxEmptyString);