summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorEugenio Favalli <elvenprogrammer@gmail.com>2005-07-09 11:00:51 +0000
committerEugenio Favalli <elvenprogrammer@gmail.com>2005-07-09 11:00:51 +0000
commitd3202d55214abb4e6df30a54eceff3b24746ee13 (patch)
treebefa461cb42b382894d7bbb1bcd4e77457f260b7 /src/gui
parenta458bf24b65f7f2b7e8c4aa156e04ab672a79e6e (diff)
downloadmana-d3202d55214abb4e6df30a54eceff3b24746ee13.tar.gz
mana-d3202d55214abb4e6df30a54eceff3b24746ee13.tar.bz2
mana-d3202d55214abb4e6df30a54eceff3b24746ee13.tar.xz
mana-d3202d55214abb4e6df30a54eceff3b24746ee13.zip
Some win32 fixes most of all
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/gui.cpp9
-rw-r--r--src/gui/setup.cpp8
-rw-r--r--src/gui/updatewindow.cpp10
-rw-r--r--src/gui/updatewindow.h10
4 files changed, 15 insertions, 22 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index a6f9ad4b..8569f2cb 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -82,17 +82,10 @@ Gui::Gui(Graphics *graphics)
// Set global font
try {
guiFont = new gcn::ImageFont(
- TMW_DATADIR "data/graphics/gui/fixedfont.png",
+ "data/graphics/gui/fixedfont.png",
" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567"
"89:@!\"$%&/=?^+*#[]{}()<>_;'.,\\|-~`��"
);
- /*
- guiFont = new gcn::ImageFont(
- TMW_DATADIR "data/graphics/gui/rpgfont.png",
- " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567"
- "89_,!?-+/():;%&`'*#=[]\""
- );
- */
}
catch (gcn::Exception e)
{
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index a01e804f..b839c459 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -215,12 +215,12 @@ void Setup::action(const std::string &eventId)
displayFlags &= ~SDL_FULLSCREEN;
changed = true;
}
-
+
if(changed) {
displayFlags |= SDL_DOUBLEBUF;
if (useOpenGL) {
- displayFlags |= SDL_OPENGL;
- SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+ //displayFlags |= SDL_OPENGL;
+ //SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
}
screen = SDL_SetVideoMode(screenW, screenH, bitDepth, displayFlags);
@@ -228,7 +228,7 @@ void Setup::action(const std::string &eventId)
std::cerr << "Couldn't set " << screenW << "x" <<
screenH << "x" << bitDepth << " video mode: " <<
SDL_GetError() << std::endl;
- exit(1);
+ exit(1);
}
}
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 813e6254..b037103b 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -24,7 +24,7 @@
#include "updatewindow.h"
#include <sstream>
-UpdateWindow::UpdateWindow()
+UpdaterWindow::UpdaterWindow()
: Window("Updating")
{
setContentSize(320, 96);
@@ -42,24 +42,24 @@ UpdateWindow::UpdateWindow()
add(vbox);
}
-UpdateWindow::~UpdateWindow()
+UpdaterWindow::~UpdaterWindow()
{
delete label;
delete progressBar;
delete vbox;
}
-void UpdateWindow::setProgress(double p)
+void UpdaterWindow::setProgress(double p)
{
progress = p;
}
-void UpdateWindow::setLabel(const std::string &str)
+void UpdaterWindow::setLabel(const std::string &str)
{
labelText = str;
}
-void UpdateWindow::draw(gcn::Graphics *graphics)
+void UpdaterWindow::draw(gcn::Graphics *graphics)
{
std::stringstream ss;
ss << labelText << " (" << progress * 100 << "%)";
diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h
index 94b1ca8f..8432b65e 100644
--- a/src/gui/updatewindow.h
+++ b/src/gui/updatewindow.h
@@ -21,8 +21,8 @@
* $Id$
*/
-#ifndef _UPDATEWINDOW_H
-#define _UPDATEWINDOW_H
+#ifndef _UPDATERWINDOW_H
+#define _UPDATERWINDOW_H
#include "gui.h"
#include "window.h"
@@ -34,7 +34,7 @@
*
* \ingroup GUI
*/
-class UpdateWindow : public Window
+class UpdaterWindow : public Window
{
protected:
std::string labelText; /**< Text for caption label */
@@ -48,12 +48,12 @@ class UpdateWindow : public Window
/**
* Constructor
*/
- UpdateWindow();
+ UpdaterWindow();
/**
* Destructor
*/
- ~UpdateWindow();
+ ~UpdaterWindow();
/**
* Set's progress bar status