As in 2.2.9, toolbars should not get the focus.

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

diff --git a/include/wx/gdiobj.h b/include/wx/gdiobj.h
index aa3606dbdf95b7787bd9baaa4901963c5f954746..46f310dc888022fe43242dada45fb3c4e03f69f4 100644 (file)
--- a/include/wx/gdiobj.h
+++ b/include/wx/gdiobj.h
@@ -1,13 +1,23 @@
-#ifndef __GDIOBJH_BASE__
-#define __GDIOBJH_BASE__
+#ifndef _WX_GDIOBJ_H_BASE_
+#define _WX_GDIOBJ_H_BASE_

 
 

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

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

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

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

+#elif defined(__WXX11__)
+#include "wx/x11/gdiobj.h"
+#elif defined(__WXMGL__)
+#include "wx/mgl/gdiobj.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/gdiobj.h"
+#elif defined(__WXPM__)
+#include "wx/os2/gdiobj.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/gdiobj.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __GDIOBJH_BASE__
+    // _WX_GDIOBJ_H_BASE_