diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-04-04 13:24:22 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-04-04 13:52:45 +0300 |
| commit | a29f494326b3ed8eba809131b799b649e88b9b85 (patch) | |
| tree | 60afb4c8ccef14750d6833b096f74da8f7f5c074 /dtrans | |
| parent | 1bf7f6a1a50ee9f24a3687240fe6ae390b905a6b (diff) | |
Revert "tdf#105162: Need to call epoxy_handle_external_wglMakeCurrent()"
It worked (for the specific case in the bug report), but for a more
generic fix that covers also other similar cases (where VCL code gets
called in threads that epoxy doesn't know about, or something), it's
better to call epoxy_handle_external_wglMakeCurrent() in vcl, instead
of all over the place in thread callbacks.
This reverts commit 78c67c6bbba0eaa418c573637858828b274b3c72.
Change-Id: Iaad7b3d1191847b9d3f1e74c3339de9f16194aed
Diffstat (limited to 'dtrans')
| -rw-r--r-- | dtrans/Library_dnd.mk | 5 | ||||
| -rw-r--r-- | dtrans/source/win32/dnd/sourcecontext.cxx | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk index 689bbe6303f4..9ce6c4439e05 100644 --- a/dtrans/Library_dnd.mk +++ b/dtrans/Library_dnd.mk @@ -32,7 +32,6 @@ $(eval $(call gb_Library_use_libraries,dnd,\ cppu \ cppuhelper \ sal \ - vcl \ $(gb_UWINAPI) \ )) @@ -49,10 +48,6 @@ $(eval $(call gb_Library_use_static_libraries,dnd,\ dtobj \ )) -$(eval $(call gb_Library_use_externals,dnd,\ - epoxy \ - )) - $(eval $(call gb_Library_add_exception_objects,dnd,\ dtrans/source/win32/dnd/dndentry \ dtrans/source/win32/dnd/globals \ diff --git a/dtrans/source/win32/dnd/sourcecontext.cxx b/dtrans/source/win32/dnd/sourcecontext.cxx index ea90087d7193..08adfaaea0cb 100644 --- a/dtrans/source/win32/dnd/sourcecontext.cxx +++ b/dtrans/source/win32/dnd/sourcecontext.cxx @@ -19,9 +19,6 @@ #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp> -#include <epoxy/wgl.h> -#include <vcl/opengl/OpenGLWrapper.hxx> - #include "sourcecontext.hxx" using namespace com::sun::star::datatransfer::dnd; @@ -74,8 +71,6 @@ void SAL_CALL SourceContext::transferablesFlavorsChanged( ) // Fires XDragSourceListener::dragDropEnd events. void SourceContext::fire_dragDropEnd( bool success, sal_Int8 effect) { - if( OpenGLWrapper::isVCLOpenGLEnabled() ) - epoxy_handle_external_wglMakeCurrent(); DragSourceDropEvent e; |