Applied patch [ 739063 ] window.cpp (gtk) - mouse event processing

[wxWidgets.git] / src / msw / window.cpp

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index ec90c5d2b733e66f1ee4ae3e352ca105bfd83a79..f5db90dc550348a211e1c657c8bf0fd51fc08368 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -112,6 +112,10 @@
     #include "wx/msw/gnuwin32/extra.h"
 #endif
 
+#if defined(__GNUG__)
+#include "wx/msw/missing.h"
+#endif
+
 // ----------------------------------------------------------------------------
 // standard constants not available with all compilers/headers
 // ----------------------------------------------------------------------------
@@ -1034,6 +1038,7 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
     // Windows XP. Instead we get the appropriate style for the theme.
 
     if (border == wxBORDER_DEFAULT && wxTheApp->GetAuto3D() && 
+        IsKindOf(CLASSINFO(wxControl)) &&
         GetParent() && (GetParent()->IsKindOf(CLASSINFO(wxPanel)) ||
                         GetParent()->IsKindOf(CLASSINFO(wxDialog))) &&
         ((GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS) != wxUSER_COLOURS))