Trying to hide evidence of my negative programming skills...

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

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index 559d903ec2223a0ce701d095d1deb60f3c514b5c..88205f033f68f29744c8d942f71b8792e55a60aa 100644 (file)
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -1,33 +1,21 @@
 #ifndef _WX_FONTDLG_H_BASE_
 #define _WX_FONTDLG_H_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 sm_classwxFontDialog sm_classwxGenericFontDialog
 #   define wxFontDialog wxGenericFontDialog
 #   define sm_classwxFontDialog sm_classwxGenericFontDialog

+#elif defined(__WXMSW__)
+#   include "wx/msw/fontdlg.h"

 #elif defined(__WXGTK__)
 #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
+#   include "wx/gtk/fontdlg.h"

 #elif defined(__WXPM__)
 #elif defined(__WXPM__)

-#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/os2/fontdlg.h"

 #endif
 
 #endif
 

+#endif // wxUSE_FONTDLG
+

 #endif
     // _WX_FONTDLG_H_BASE_
 #endif
     // _WX_FONTDLG_H_BASE_