fixes to previous fixes for Sun's CC 5.0

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

diff --git a/include/wx/menu.h b/include/wx/menu.h
index 9a9335729d123bfdde281f1e6119b31362f86455..2d0ce9798b171b079f0c4659c48d48bc5850aac5 100644 (file)
--- a/include/wx/menu.h
+++ b/include/wx/menu.h
@@ -1,13 +1,19 @@
-#ifndef __MENUH_BASE__
-#define __MENUH_BASE__
+#ifndef _WX_MENU_H_BASE_
+#define _WX_MENU_H_BASE_
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/menu.h"
-#elif defined(__MOTIF__)
-#include "wx/xt/menu.h"
-#elif defined(__GTK__)
+#elif defined(__WXMOTIF__)
+#include "wx/motif/menu.h"
+#elif defined(__WXGTK__)
 #include "wx/gtk/menu.h"
+#elif defined(__WXQT__)
+#include "wx/qt/menu.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/menu.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/menu.h"
 #endif
 
 #endif
-    // __MENUH_BASE__
+    // _WX_MENU_H_BASE_