Ported trunk over to Guichan 0.8.0. Based on merge from 0.0 branch, but because

of quite a bit of GUI differences there were additional changes and probably
additional issues. You have been warned. ;)

Merged revisions 4045-4049,4051-4059 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0

........
  r4045 | b_lindeijer | 2008-04-07 17:23:07 +0200 (Mon, 07 Apr 2008) | 3 lines

  Upgraded to Guichan 0.8.0 (merge from guichan-0.8 branch, except for
  gcn::TabbedArea usage)
........
  r4059 | b_lindeijer | 2008-04-09 16:25:42 +0200 (Wed, 09 Apr 2008) | 2 lines

  Fixed problem with row height in shop list box.
........

1 files changed, 6 insertions, 6 deletions

diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp
index c9d974a6..7ed4f913 100644
--- a/src/gui/quitdialog.cpp
+++ b/src/gui/quitdialog.cpp
@@ -65,13 +65,13 @@ QuitDialog::QuitDialog(bool* quitGame, QuitDialog** pointerToMe):
         state == STATE_LOGIN_ATTEMPT ||
         state == STATE_UPDATE)
     {
-        mForceQuit->setMarked(true);
+        mForceQuit->setSelected(true);
         add(mForceQuit);
     }
     else
     {
         // Only added if we are connected to an accountserver or gameserver
-        mLogoutQuit->setMarked(true);
+        mLogoutQuit->setSelected(true);
         add(mLogoutQuit);
         add(mSwitchAccountServer);
 
@@ -104,11 +104,11 @@ QuitDialog::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "ok")
     {
-        if (mForceQuit->isMarked())
+        if (mForceQuit->isSelected())
         {
             state = STATE_FORCE_QUIT;
         }
-        else if (mLogoutQuit->isMarked())
+        else if (mLogoutQuit->isSelected())
         {
             if ((state == STATE_GAME) && (mQuitGame))
             {
@@ -116,7 +116,7 @@ QuitDialog::action(const gcn::ActionEvent &event)
             }
             state = STATE_EXIT;
         }
-        else if (mSwitchAccountServer->isMarked())
+        else if (mSwitchAccountServer->isSelected())
         {
             if ((state == STATE_GAME) && (mQuitGame))
             {
@@ -124,7 +124,7 @@ QuitDialog::action(const gcn::ActionEvent &event)
             }
             state = STATE_SWITCH_ACCOUNTSERVER_ATTEMPT;
         }
-        else if (mSwitchCharacter->isMarked())
+        else if (mSwitchCharacter->isSelected())
         {
             if (mQuitGame) *mQuitGame = true;