Added GSocket/wxSocket alias to socket.h to prevent us from using GSocket

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

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index e30ce09aaf8221a96def6cde5a23468e7d35fe21..b9cc32e084c13d0fbb95d8e49c8e4dcd36388a30 100644 (file)
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -1,13 +1,31 @@
-#ifndef __FONTDLGH_BASE__
-#define __FONTDLGH_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 defined(__WXMSW__)
 #include "wx/msw/fontdlg.h"
 #elif defined(__WXMOTIF__)
 #include "wx/generic/fontdlgg.h"

+#   define wxFontDialog wxGenericFontDialog
+#   define sm_classwxFontDialog sm_classwxGenericFontDialog

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

+#include "wx/gtk/fontdlg.h"
+#elif defined(__WXQT__)

 #include "wx/generic/fontdlgg.h"
 #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/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

 #endif
 
 #endif
 #endif
 
 #endif

-    // __FONTDLGH_BASE__
+    // _WX_FONTDLG_H_BASE_