Further wxUniv fixes

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

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index 20445e884257d56314e21b1bea3c1caa04002f84..a7fe76f87d8b1e87e8b3d16b47720267a898b6f8 100644 (file)
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -1,29 +1,33 @@
 #ifndef _WX_FONTDLG_H_BASE_
 #define _WX_FONTDLG_H_BASE_
 
 #ifndef _WX_FONTDLG_H_BASE_
 #define _WX_FONTDLG_H_BASE_
 

+#if wxUSE_FONTDLG
+

 #if defined(__WXMSW__)
 #include "wx/msw/fontdlg.h"
 #elif defined(__WXMOTIF__)
 #include "wx/generic/fontdlgg.h"
 #   define wxFontDialog wxGenericFontDialog
 #if defined(__WXMSW__)
 #include "wx/msw/fontdlg.h"
 #elif defined(__WXMOTIF__)
 #include "wx/generic/fontdlgg.h"
 #   define wxFontDialog wxGenericFontDialog

-#   define classwxFontDialog classwxGenericFontDialog
+#   define sm_classwxFontDialog sm_classwxGenericFontDialog

 #elif defined(__WXGTK__)
 #elif defined(__WXGTK__)

-#include "wx/generic/fontdlgg.h"
-#   define wxFontDialog wxGenericFontDialog
-#   define classwxFontDialog classwxGenericFontDialog
+#include "wx/gtk/fontdlg.h"

 #elif defined(__WXQT__)
 #include "wx/generic/fontdlgg.h"
 #   define wxFontDialog wxGenericFontDialog
 #elif defined(__WXQT__)
 #include "wx/generic/fontdlgg.h"
 #   define wxFontDialog wxGenericFontDialog

-#   define classwxFontDialog classwxGenericFontDialog
+#   define sm_classwxFontDialog sm_classwxGenericFontDialog

 #elif defined(__WXMAC__)
 #include "wx/generic/fontdlgg.h"
 #   define wxFontDialog wxGenericFontDialog
 #elif defined(__WXMAC__)
 #include "wx/generic/fontdlgg.h"
 #   define wxFontDialog wxGenericFontDialog

-#   define classwxFontDialog classwxGenericFontDialog
+#   define sm_classwxFontDialog sm_classwxGenericFontDialog
+#elif defined(__WXPM__)
+#include "wx/os2/fontdlg.h"

 #elif defined(__WXSTUBS__)
 #include "wx/generic/fontdlgg.h"
 #   define wxFontDialog wxGenericFontDialog
 #elif defined(__WXSTUBS__)
 #include "wx/generic/fontdlgg.h"
 #   define wxFontDialog wxGenericFontDialog

-#   define classwxFontDialog classwxGenericFontDialog
+#   define sm_classwxFontDialog sm_classwxGenericFontDialog

 #endif
 
 #endif
 

+#endif // wxUSE_FONTDLG
+

 #endif
     // _WX_FONTDLG_H_BASE_
 #endif
     // _WX_FONTDLG_H_BASE_