compilation/build fixes for wxUniv

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

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index f851cd8ee96f5de7314439724d23b5033b35ed6d..88205f033f68f29744c8d942f71b8792e55a60aa 100644 (file)
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -1,29 +1,21 @@
 #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
 
+#endif // wxUSE_FONTDLG
+
 #endif
     // _WX_FONTDLG_H_BASE_