#ifndef _TOOLBAR_H_BASE_
#define _TOOLBAR_H_BASE_
-#if defined(__WINDOWS__) && defined(__WIN95__)
+#if defined(__WXMSW__) && defined(__WIN95__)
# include "wx/tbar95.h"
# define wxToolBar wxToolBar95
# define classwxToolBar classwxToolBar95
-#elif defined(__WINDOWS__)
+#elif defined(__WXMSW__)
# include "wx/tbarmsw.h"
# define wxToolBar wxToolBarMSW
# define classwxToolBar classwxToolBarMSW
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
# include "wx/gtk/tbargtk.h"
# define classwxToolBar wxToolBarGTK
#endif