file which undefs symbols ocnflicting with windows.h

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

diff --git a/include/wx/font.h b/include/wx/font.h
index 438c623973d4a6050ed8984f61695275414726db..165c9c9f06452984ab3b408b7ce5f11b0c7afce5 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -1,13 +1,19 @@
-#ifndef __FONTH_BASE__
-#define __FONTH_BASE__
+#ifndef _WX_FONT_H_BASE_
+#define _WX_FONT_H_BASE_

 
 

-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)

 #include "wx/msw/font.h"
 #include "wx/msw/font.h"

-#elif defined(__MOTIF__)
-#include "wx/xt/font.h"
-#elif defined(__GTK__)
+#elif defined(__WXMOTIF__)
+#include "wx/motif/font.h"
+#elif defined(__WXGTK__)

 #include "wx/gtk/font.h"
 #include "wx/gtk/font.h"

+#elif defined(__WXQT__)
+#include "wx/qt/font.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/font.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/font.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __FONTH_BASE__
+    // _WX_FONT_H_BASE_