Applied toolbar patch for wxTB_RIGHT support (patch #1595081).

[wxWidgets.git] / src / msw / ole / activex.cpp

diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp
index 23415001823e0cde63d73f42a8bb7c1c1dae6dd2..e54ffabb78e8d3300de4750dcc89c26989196fa9 100644 (file)
--- a/src/msw/ole/activex.cpp
+++ b/src/msw/ole/activex.cpp
@@ -23,15 +23,13 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_ACTIVEX
+

 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"
     #include "wx/math.h"
 #endif
 
 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"
     #include "wx/math.h"
 #endif
 

-// I don't know why members of tagVARIANT aren't found when compiling
-// with Wine
-#ifndef __WINE__
-

 #include "wx/msw/ole/activex.h"
 // autointerfaces that we only use here
 WX_DECLARE_AUTOOLE(wxAutoIOleInPlaceSite, IOleInPlaceSite)
 #include "wx/msw/ole/activex.h"
 // autointerfaces that we only use here
 WX_DECLARE_AUTOOLE(wxAutoIOleInPlaceSite, IOleInPlaceSite)


@@ -896,7 +894,6 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
             continue;
 
         // check if default event sink
             continue;
 
         // check if default event sink

-        bool defInterface = false;

         bool defEventSink = false;
         int impTypeFlags = 0;
         typeInfo->GetImplTypeFlags(i, &impTypeFlags);
         bool defEventSink = false;
         int impTypeFlags = 0;
         typeInfo->GetImplTypeFlags(i, &impTypeFlags);


@@ -914,11 +911,6 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
                     wxFAIL_MSG(wxT("Default event sink is in vtable!"));
                 }
             }
                     wxFAIL_MSG(wxT("Default event sink is in vtable!"));
                 }
             }

-            else
-            {
-                // WXOLE_TRACEOUT("Default Interface");
-                defInterface = true;
-            }

         }
 
 
         }
 
 


@@ -1163,5 +1155,4 @@ void wxActiveXContainer::OnKillFocus(wxFocusEvent& event)
     event.Skip();
 }
 
     event.Skip();
 }
 

-#endif
-// __WINE__
+#endif // wxUSE_ACTIVEX