More wxMotif work, OGL enhancements, USE_ macro corrections, object.cpp delete

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

diff --git a/include/wx/tbarmsw.h b/include/wx/tbarmsw.h
index 7923368419e0a7fc0571c10da2bbd31b9a06d258..4b9d761fcfb87d08c63d71c4ddf318c5ace20271 100644 (file)
--- a/include/wx/tbarmsw.h
+++ b/include/wx/tbarmsw.h
@@ -1,13 +1,13 @@
-#ifndef __TBARMSWH_BASE__
-#define __TBARMSWH_BASE__
+#ifndef _WX_TBARMSW_H_BASE_
+#define _WX_TBARMSW_H_BASE_
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/tbarmsw.h"
-#elif defined(__MOTIF__)
-#include "wx/xt/tbarmsw.h"
-#elif defined(__GTK__)
+#elif defined(__WXMOTIF__)
+#include "wx/motif/tbarmsw.h"
+#elif defined(__WXGTK__)
 #include "wx/gtk/tbarmsw.h"
 #endif
 
 #endif
-    // __TBARMSWH_BASE__
+    // _WX_TBARMSW_H_BASE_