X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b4e76e0d7e4c1be878e125df31dc9370bb0fa99e..988a8d440e98d86557c6a6393ee20bbca65bfe6f:/include/wx/fontdlg.h?ds=sidebyside

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index 5aeb8cf6c9..1396becad1 100644
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -1,21 +1,27 @@
-#ifndef __FONTDLGH_BASE__
-#define __FONTDLGH_BASE__
+#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 classwxFontDialog classwxGenericFontDialog
+#   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 classwxFontDialog classwxGenericFontDialog
-#elif defined(__WXQT__)
-#include "wx/generic/fontdlgg.h"
-#   define wxFontDialog wxGenericFontDialog
-#   define classwxFontDialog 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
-    // __FONTDLGH_BASE__
+    // _WX_FONTDLG_H_BASE_