X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cb50e4b4677abb67ffe9026780861c1b12a0463..bff4ec6360d28f3309e5199685950b43ab5e079a:/include/wx/fontdlg.h diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h index f851cd8ee9..1396becad1 100644 --- a/include/wx/fontdlg.h +++ b/include/wx/fontdlg.h @@ -1,29 +1,27 @@ #ifndef _WX_FONTDLG_H_BASE_ #define _WX_FONTDLG_H_BASE_ -#if defined(__WXMSW__) -#include "wx/msw/fontdlg.h" -#elif defined(__WXMOTIF__) -#include "wx/generic/fontdlgg.h" +#if wxUSE_FONTDLG + +#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/generic/fontdlgg.h" -# define wxFontDialog wxGenericFontDialog -# define sm_classwxFontDialog sm_classwxGenericFontDialog -#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 -#elif defined(__WXSTUBS__) -#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" #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 // _WX_FONTDLG_H_BASE_