X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/31189345e11ad176f8088f72a78b6e49a6dd5a92..49a63afbad7646668df343d29edd88458bc7e0a9:/include/wx/fontdlg.h?ds=sidebyside diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h index 43dfd3d764..2c2e4d13c1 100644 --- a/include/wx/fontdlg.h +++ b/include/wx/fontdlg.h @@ -17,13 +17,13 @@ #if wxUSE_FONTDLG #include "wx/dialog.h" // the base class -#include "wx/cmndata.h" // wxFontData +#include "wx/fontdata.h" // ---------------------------------------------------------------------------- // wxFontDialog interface // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFontDialogBase : public wxDialog +class WXDLLIMPEXP_CORE wxFontDialogBase : public wxDialog { public: // create the font dialog @@ -58,7 +58,7 @@ protected: wxFontData m_fontData; - DECLARE_NO_COPY_CLASS(wxFontDialogBase) + wxDECLARE_NO_COPY_CLASS(wxFontDialogBase); }; #if WXWIN_COMPATIBILITY_2_6 @@ -74,7 +74,7 @@ inline bool wxFontDialogBase::Create(wxWindow *parent, const wxFontData *data) // platform-specific wxFontDialog implementation // ---------------------------------------------------------------------------- -#if defined( __WXMAC_OSX__ ) && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 ) +#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,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 -wxFont WXDLLEXPORT -wxGetFontFromUser(wxWindow *parent = (wxWindow *)NULL, - const wxFont& fontInit = wxNullFont, const wxString& caption = wxEmptyString); +WXDLLIMPEXP_CORE wxFont wxGetFontFromUser(wxWindow *parent = NULL, + const wxFont& fontInit = wxNullFont, + const wxString& caption = wxEmptyString); #endif // wxUSE_FONTDLG