Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix clobbered merging in wzapp_c.h, and add Qt function to throw up a fatal warning dialog. 

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10830 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2010-05-16 08:33:54 +00:00 committed by Git SVN Gateway
parent 0b2b4f70af
commit 1a5df98e9f
2 changed files with 7 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/framework/wzapp.cpp
View File

@ -26,6 +26,7 @@
#include <QtGui/QMouseEvent>
#include <QtGui/QClipboard>
#include <QtGui/QDesktopWidget>
#include <QtGui/QMessageBox>
// Get platform defines before checking for them.
// Qt headers MUST come before platform specific stuff!
@ -1160,6 +1161,11 @@ void iV_SetTextSize(float size)
WzMainWindow::instance()->setFontSize(size);
}
void wzFatalDialog(const char *text)
{
QMessageBox::critical(NULL, "Fatal error", text);
}
static int WZkeyToQtKey(int code)
{
if (code >= Qt::Key_0 && code <= Qt::Key_AsciiTilde)

69
lib/framework/wzapp_c.h
View File

@ -44,74 +44,7 @@ void wzReleaseMouse(void); ///< Undo the wzGrabMouse operation
bool wzActiveWindow(void); ///< Whether application currently has the mouse pointer over it
int wzGetTicks(void); ///< Milliseconds since start of game
const char *wzGetClipboard(void); ///< Get reference to static string of clipboard contents; not reentrant!
// Thread related
WZ_THREAD *wzThreadCreate(int (*threadFunc)(void *), void *data);
int wzThreadJoin(WZ_THREAD *thread);
void wzThreadStart(WZ_THREAD *thread);
bool wzIsThreadDone(WZ_THREAD *thread);
void wzYieldCurrentThread(void);
WZ_MUTEX *wzMutexCreate(void);
void wzMutexDestroy(WZ_MUTEX *mutex);
void wzMutexLock(WZ_MUTEX *mutex);
void wzMutexUnlock(WZ_MUTEX *mutex);
WZ_SEMAPHORE *wzSemaphoreCreate(int startValue);
void wzSemaphoreDestroy(WZ_SEMAPHORE *semaphore);
void wzSemaphoreWait(WZ_SEMAPHORE *semaphore);
void wzSemaphorePost(WZ_SEMAPHORE *semaphore);
int wzSemaphoreAvailable(WZ_SEMAPHORE *semaphore);
#ifdef __cplusplus
}
#endif //__cplusplus
#endif
/*
This file is part of Warzone 2100.
Copyright (C) 1999-2004 Eidos Interactive
Copyright (C) 2005-2009 Warzone Resurrection Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
Warzone 2100 is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Warzone 2100; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __INCLUDED_WZAPP_C_H__
#define __INCLUDED_WZAPP_C_H__
#ifdef __cplusplus
extern "C"
{
#endif //__cplusplus
struct _wzThread;
struct _wzMutex;
struct _wzSemaphore;
typedef struct _wzThread WZ_THREAD;
typedef struct _wzMutex WZ_MUTEX;
typedef struct _wzSemaphore WZ_SEMAPHORE;
int wzInit(int argc, char *argv[], int fsaa, bool vsync, int w, int h, bool fullscreen);
void wzQuit(void); ///< Quit game
void wzCreateCursor(CURSOR index, uint8_t *data, uint8_t *mask, int w, int h, int hot_x, int hot_y);
void wzSetCursor(CURSOR index);
void wzScreenFlip(void); ///< Swap the graphics buffers
void wzGrabMouse(void); ///< Trap mouse cursor in application window
void wzReleaseMouse(void); ///< Undo the wzGrabMouse operation
bool wzActiveWindow(void); ///< Whether application currently has the mouse pointer over it
int wzGetTicks(void); ///< Milliseconds since start of game
const char *wzGetClipboard(void); ///< Get reference to static string of clipboard contents; not reentrant!
void wzFatalDialog(const char *text); ///< Throw up a modal warning dialog
// Thread related
WZ_THREAD *wzThreadCreate(int (*threadFunc)(void *), void *data);