Fixed crass on character creation, allowed some character creation windows to be Esc-able

apps/openmw/mwgui/class.cpp

@@ -718,6 +718,11 @@ namespace MWGui
     }
 
     void SelectSpecializationDialog::onCancelClicked(MyGUI::Widget* _sender)
+    {
+        exit();
+    }
+
+    void SelectSpecializationDialog::exit()
     {
         eventCancel();
     }
@@ -764,6 +769,11 @@ namespace MWGui
     }
 
     void SelectAttributeDialog::onCancelClicked(MyGUI::Widget* _sender)
+    {
+        exit();
+    }
+
+    void SelectAttributeDialog::exit()
     {
         eventCancel();
     }
@@ -855,6 +865,11 @@ namespace MWGui
     }
 
     void SelectSkillDialog::onCancelClicked(MyGUI::Widget* _sender)
+    {
+        exit();
+    }
+
+    void SelectSkillDialog::exit()
     {
         eventCancel();
     }

apps/openmw/mwgui/class.hpp

@@ -136,6 +136,8 @@ namespace MWGui
         SelectSpecializationDialog();
         ~SelectSpecializationDialog();
 
+        virtual void exit();
+
         ESM::Class::Specialization getSpecializationId() const { return mSpecializationId; }
 
         // Events
@@ -167,6 +169,8 @@ namespace MWGui
         SelectAttributeDialog();
         ~SelectAttributeDialog();
 
+        virtual void exit();
+
         ESM::Attribute::AttributeID getAttributeId() const { return mAttributeId; }
 
         // Events
@@ -196,6 +200,8 @@ namespace MWGui
         SelectSkillDialog();
         ~SelectSkillDialog();
 
+        virtual void exit();
+
         ESM::Skill::SkillEnum getSkillId() const { return mSkillId; }
 
         // Events

apps/openmw/mwgui/countdialog.cpp

@@ -49,7 +49,12 @@ namespace MWGui
         mItemEdit->setCaption(boost::lexical_cast<std::string>(maxCount));
     }
 
-    void CountDialog::cancel()
+    void CountDialog::cancel() //Keeping this here as I don't know if anything else relies on it.
+    {
+        exit();
+    }
+
+    void CountDialog::exit()
     {
         setVisible(false);
     }

apps/openmw/mwgui/countdialog.hpp

@@ -11,6 +11,7 @@ namespace MWGui
             CountDialog();
             void open(const std::string& item, const std::string& message, const int maxCount);
             void cancel();
+            virtual void exit();
 
             typedef MyGUI::delegates::CMultiDelegate2<MyGUI::Widget*, int> EventHandle_WidgetInt;
 

apps/openmw/mwgui/windowbase.cpp

@@ -56,11 +56,6 @@ void WindowModal::close()
     MWBase::Environment::get().getWindowManager()->removeCurrentModal(this);
 }
 
-void WindowModal::exit()
-{
-    close();
-}
-
 NoDrop::NoDrop(DragAndDrop *drag, MyGUI::Widget *widget)
     : mDrag(drag), mWidget(widget), mTransparent(false)
 {

apps/openmw/mwgui/windowbase.hpp

@@ -47,7 +47,7 @@ namespace MWGui
         WindowModal(const std::string& parLayout);
         virtual void open();
         virtual void close();
-        virtual void exit();
+        virtual void exit() {}
     };
 
     /// A window that cannot be the target of a drag&drop action.