From e551c60e755b34939459ebd3f49407714d2c8f45 Mon Sep 17 00:00:00 2001
From: Jan-Peter Nilsson <peppe@pappkartong.se>
Date: Sat, 6 Nov 2010 11:26:45 +0100
Subject: [PATCH] Make RaceDialog use the new WindowBase

---
 apps/openmw/mwgui/race.cpp | 9 ++-------
 apps/openmw/mwgui/race.hpp | 6 ++----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp
index 04896aef1..8ba9d8fe2 100644
--- a/apps/openmw/mwgui/race.cpp
+++ b/apps/openmw/mwgui/race.cpp
@@ -16,8 +16,7 @@ using namespace MWGui;
 using namespace Widgets;
 
 RaceDialog::RaceDialog(MWWorld::Environment& environment)
-  : Layout("openmw_chargen_race_layout.xml")
-  , environment(environment)
+  : WindowBase("openmw_chargen_race_layout.xml", environment)
   , genderIndex(0)
   , faceIndex(0)
   , hairIndex(0)
@@ -25,11 +24,7 @@ RaceDialog::RaceDialog(MWWorld::Environment& environment)
   , hairCount(14)
 {
     // Centre dialog
-    MyGUI::IntSize gameWindowSize = environment.mWindowManager->getGui()->getViewSize();
-    MyGUI::IntCoord coord = mMainWidget->getCoord();
-    coord.left = (gameWindowSize.width - coord.width)/2;
-    coord.top = (gameWindowSize.height - coord.height)/2;
-    mMainWidget->setCoord(coord);
+    center();
 
     // These are just demo values, you should replace these with
     // real calls from outside the class later.
diff --git a/apps/openmw/mwgui/race.hpp b/apps/openmw/mwgui/race.hpp
index bfa3c505d..47774703c 100644
--- a/apps/openmw/mwgui/race.hpp
+++ b/apps/openmw/mwgui/race.hpp
@@ -3,7 +3,7 @@
 
 #include <components/esm_store/store.hpp>
 
-#include <openengine/gui/layout.hpp>
+#include "window_base.hpp"
 
 #include <boost/array.hpp>
 
@@ -21,7 +21,7 @@ namespace MWGui
 {
     using namespace MyGUI;
 
-    class RaceDialog : public OEngine::GUI::Layout
+    class RaceDialog : public WindowBase
     {
     public:
         RaceDialog(MWWorld::Environment& environment);
@@ -80,8 +80,6 @@ namespace MWGui
         void updateSkills();
         void updateSpellPowers();
 
-        MWWorld::Environment& environment;
-
         MyGUI::CanvasPtr  appearanceBox;
         MyGUI::ListPtr    raceList;
         MyGUI::HScrollPtr headRotate;