merged in the commit from the 2.2 branch

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

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index ca180e0bfe9d1d4096a04e00ff35495dddd7dd7d..f4e88317c28a304bfe4ac81138f43ec98803411f 100644 (file)
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -1,13 +1,29 @@
-#ifndef __FONTDLGH_BASE__
-#define __FONTDLGH_BASE__
+#ifndef _WX_FONTDLG_H_BASE_
+#define _WX_FONTDLG_H_BASE_
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/fontdlg.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/generic/fontdlgg.h"
-#elif defined(__GTK__)
+#   define wxFontDialog wxGenericFontDialog
+#   define sm_classwxFontDialog sm_classwxGenericFontDialog
+#elif defined(__WXGTK__)
+#include "wx/gtk/fontdlg.h"
+#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(__WXPM__)
+#include "wx/os2/fontdlg.h"
+#elif defined(__WXSTUBS__)
+#include "wx/generic/fontdlgg.h"
+#   define wxFontDialog wxGenericFontDialog
+#   define sm_classwxFontDialog sm_classwxGenericFontDialog
 #endif
 
 #endif
-    // __FONTDLGH_BASE__
+    // _WX_FONTDLG_H_BASE_