Committing in .

[wxWidgets.git] / include / wx / fontdlg.h

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index ca180e0bfe9d1d4096a04e00ff35495dddd7dd7d..1396becad1c058a0102b8f978d05fdde8fa51a82 100644 (file)
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -1,13 +1,27 @@
-#ifndef __FONTDLGH_BASE__
-#define __FONTDLGH_BASE__
-
-#if defined(__WINDOWS__)
-#include "wx/msw/fontdlg.h"
-#elif defined(__MOTIF__)
-#include "wx/generic/fontdlgg.h"
-#elif defined(__GTK__)
-#include "wx/generic/fontdlgg.h"
+#ifndef _WX_FONTDLG_H_BASE_
+#define _WX_FONTDLG_H_BASE_
+
+#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/gtk/fontdlg.h"
+#elif defined(__WXPM__)
+#   include "wx/os2/fontdlg.h"

 #endif
 
 #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
 #endif

-    // __FONTDLGH_BASE__
+    // _WX_FONTDLG_H_BASE_