Revert a careless change
Seems I did something wrong with SVN. Revert the changed parts that should not have been changed.
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
#define GL_GLEXT_PROTOTYPES
|
#define GL_GLEXT_PROTOTYPES
|
||||||
#include <QtOpenGL/QtOpenGL>
|
#include <QtOpenGL>
|
||||||
#include <QtCore/QTime>
|
#include <QTime>
|
||||||
|
|
||||||
#ifdef Q_WS_MAEMO_5
|
#ifdef Q_WS_MAEMO_5
|
||||||
// For volume buttons support
|
// For volume buttons support
|
||||||
|
|||||||
@@ -50,8 +50,8 @@ JGameLauncher* g_launcher = NULL;
|
|||||||
//------------------------------------------------------------------------
|
//------------------------------------------------------------------------
|
||||||
|
|
||||||
Display* gXDisplay = NULL;
|
Display* gXDisplay = NULL;
|
||||||
Window gXWindow = (Window)0;
|
Window gXWindow = (Window)NULL;
|
||||||
GLXWindow glxWin = (GLXWindow)0;
|
GLXWindow glxWin = (GLXWindow)NULL;
|
||||||
|
|
||||||
static std::multiset<JButton> gControllerState;
|
static std::multiset<JButton> gControllerState;
|
||||||
static std::multiset<JButton> gPrevControllerState;
|
static std::multiset<JButton> gPrevControllerState;
|
||||||
@@ -173,7 +173,7 @@ void KillGLWindow(void) // Properly Kill The Window
|
|||||||
{
|
{
|
||||||
if (gXWindow && gXDisplay)
|
if (gXWindow && gXDisplay)
|
||||||
XDestroyWindow(gXDisplay, gXWindow);
|
XDestroyWindow(gXDisplay, gXWindow);
|
||||||
gXWindow = (Window)0;
|
gXWindow = (Window)NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user