diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-01-26 12:31:04 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-01-26 12:46:35 +0200 |
| commit | 32d98b2551644dea50e58f99ae921a82a0f69753 (patch) | |
| tree | c3541a355edf1461317ccc2c83e89d614a0727e2 /toolkit | |
| parent | 2c55288357c9d5410afae58c1fbb97cdfabf0360 (diff) | |
Put getBufferSwapCounter() in OpenGLWindow instead
<vcl/openglwin.hxx> is a more light-weight include file and including
that causes less trouble on the various platforms.
Change-Id: I5c9baa171278d291468ef45a47d9fdbc64326957
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 7fe5032df1b4..0053928d09a4 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -22,13 +22,6 @@ #include <prewin.h> #include <postwin.h> #endif -#if defined UNX && !defined MACOSX -#include <prex.h> -#include "GL/glxew.h" -#include <postx.h> -#undef None // Avoid clash with the one in <toolkit/awt/scrollabledialog.hxx> -#undef Status // Sigh... used for instance as parameter name in css::awt::XImageConsumer -#endif #include <com/sun/star/awt/WindowAttribute.hpp> #include <com/sun/star/awt/VclWindowPeerAttribute.hpp> #include <com/sun/star/awt/WindowClass.hpp> @@ -105,6 +98,7 @@ #include <vcl/menubtn.hxx> #include <vcl/morebtn.hxx> #include <vcl/msgbox.hxx> +#include <vcl/openglwin.hxx> #include <vcl/scrbar.hxx> #include <vcl/spin.hxx> #include <vcl/split.hxx> @@ -120,7 +114,6 @@ #include <vcl/window.hxx> #include <vcl/wrkwin.hxx> #include <vcl/throbber.hxx> -#include <vcl/opengl/OpenGLContext.hxx> #include "toolkit/awt/vclxspinbutton.hxx" #include <tools/debug.hxx> #include <comphelper/processfactory.hxx> @@ -1929,7 +1922,7 @@ void SAL_CALL VCLXToolkit::processEventsToIdle() sal_Int64 SAL_CALL VCLXToolkit::getOpenGLBufferSwapCounter() throw (css::uno::RuntimeException, std::exception) { - return OpenGLContext::getBufferSwapCounter(); + return OpenGLWindow::getBufferSwapCounter(); } // css:awt:XToolkitRobot |