X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/712d087f0c32c2599ed8ae930d5665962688c8fb..e143fb636d50d5802dcc8c7c2e9e8e2944afa467:/include/wx/fontdlg.h?ds=inline diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h index 8a90823726..831d92409b 100644 --- a/include/wx/fontdlg.h +++ b/include/wx/fontdlg.h @@ -58,7 +58,7 @@ protected: wxFontData m_fontData; - DECLARE_NO_COPY_CLASS(wxFontDialogBase) + wxDECLARE_NO_COPY_CLASS(wxFontDialogBase); }; #if WXWIN_COMPATIBILITY_2_6 @@ -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);