mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Remove opengl usage from svx until we can't solve building problems"

Browse Source 
This reverts commit 10be411f33c69db83cc5de410eaddf2d297608ae.
This commit is contained in:
Markus Mohrhard 2014-03-31 23:09:24 +02:00
parent cc8f652121
commit feffcbb02c
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx
View File

@ -11,6 +11,7 @@
#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFOPENGL_HXX #define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFOPENGL_HXX
#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx> #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
#include <vcl/OpenGLContext.hxx>
class Window; class Window;
@ -25,6 +26,9 @@ public:
protected: protected:
Window* getWindow() const; Window* getWindow() const;
private:
OpenGLContext m_aOpenGLContext;
}; };
} // namespace sdr } // namespace sdr

3
svx/Library_svxcore.mk
View File

@ -75,6 +75,7 @@ $(eval $(call gb_Library_use_libraries,svxcore,\
utl \ utl \
vcl \ vcl \
xo \ xo \
$(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)),vclopengl) \
$(gb_UWINAPI) \ $(gb_UWINAPI) \
)) ))
@ -82,6 +83,8 @@ $(eval $(call gb_Library_use_externals,svxcore,\
boost_headers \ boost_headers \
icuuc \ icuuc \
icu_headers \ icu_headers \
mesa_headers \
glew \
)) ))
$(eval $(call gb_Library_add_exception_objects,svxcore,\ $(eval $(call gb_Library_add_exception_objects,svxcore,\

3
svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
View File

@ -18,6 +18,9 @@ ViewObjectContactOfOpenGLObj::ViewObjectContactOfOpenGLObj(
ObjectContact& rObjectContact, ViewContact& rViewContact ) ObjectContact& rObjectContact, ViewContact& rViewContact )
: ViewObjectContactOfSdrObj( rObjectContact, rViewContact ) : ViewObjectContactOfSdrObj( rObjectContact, rViewContact )
{ {
m_aOpenGLContext.init(getWindow());
// Set a dummy size to make the window visible
m_aOpenGLContext.setWinSize(Size(200,200));
} }
ViewObjectContactOfOpenGLObj::~ViewObjectContactOfOpenGLObj() ViewObjectContactOfOpenGLObj::~ViewObjectContactOfOpenGLObj()