X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..bc55104d9ab0b0b835644f17a152b4fbbfa8c7b9:/include/wx/fontdlg.h?ds=sidebyside diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h index a7fe76f87d..1396becad1 100644 --- a/include/wx/fontdlg.h +++ b/include/wx/fontdlg.h @@ -3,30 +3,24 @@ #if wxUSE_FONTDLG -#if defined(__WXMSW__) -#include "wx/msw/fontdlg.h" -#elif defined(__WXMOTIF__) -#include "wx/generic/fontdlgg.h" +#if defined(__WXUNIVERSAL__) || defined(__WXMOTIF__) || defined(__WXMAC__) +# include "wx/generic/fontdlgg.h" # define wxFontDialog wxGenericFontDialog # define sm_classwxFontDialog sm_classwxGenericFontDialog +#elif defined(__WXMSW__) +# include "wx/msw/fontdlg.h" #elif defined(__WXGTK__) -#include "wx/gtk/fontdlg.h" -#elif defined(__WXQT__) -#include "wx/generic/fontdlgg.h" -# define wxFontDialog wxGenericFontDialog -# define sm_classwxFontDialog sm_classwxGenericFontDialog -#elif defined(__WXMAC__) -#include "wx/generic/fontdlgg.h" -# define wxFontDialog wxGenericFontDialog -# define sm_classwxFontDialog sm_classwxGenericFontDialog +# include "wx/gtk/fontdlg.h" #elif defined(__WXPM__) -#include "wx/os2/fontdlg.h" -#elif defined(__WXSTUBS__) -#include "wx/generic/fontdlgg.h" -# define wxFontDialog wxGenericFontDialog -# define sm_classwxFontDialog sm_classwxGenericFontDialog +# include "wx/os2/fontdlg.h" #endif +// 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); + #endif // wxUSE_FONTDLG #endif