ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed old code

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9988 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria
2011-10-15 23:47:22 +00:00
parent 5ac65a28d8
commit 3655424189
2 changed files with 2 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/states_screens/main_menu_screen.cpp
View File

@@ -67,9 +67,7 @@ MainMenuScreen::MainMenuScreen() : Screen("main.stkgui")
// ----------------------------------------------------------------------------
void MainMenuScreen::loadedFromFile()
{
m_lang_popup = NULL;
{
LabelWidget* w = getWidget<LabelWidget>("info_addons");
w->setScrollSpeed(15);
} // loadedFromFile
@@ -293,40 +291,10 @@ void MainMenuScreen::eventCallback(Widget* widget, const std::string& name,
void MainMenuScreen::tearDown()
{
if (m_lang_popup != NULL)
{
closeLangPopup();
}
} // tearDown
// ----------------------------------------------------------------------------
bool MainMenuScreen::onEscapePressed()
{
if (m_lang_popup != NULL)
{
closeLangPopup();
return false;
}
return true;
} // onEscapePressed
// ----------------------------------------------------------------------------
void MainMenuScreen::closeLangPopup()
{
assert(m_lang_popup != NULL);
m_lang_popup->getIrrlichtElement()->remove();
m_lang_popup->elementRemoved();
manualRemoveWidget(m_lang_popup);
delete m_lang_popup;
m_lang_popup = NULL;
} // closeLangPopup
// ----------------------------------------------------------------------------
void MainMenuScreen::onDisabledItemClicked(const std::string& item)
{
if (item == "addons")

11
src/states_screens/main_menu_screen.hpp
View File

@@ -29,12 +29,9 @@ namespace GUIEngine { class Widget; class ListWidget; }
class MainMenuScreen : public GUIEngine::Screen, public GUIEngine::ScreenSingleton<MainMenuScreen>
{
friend class GUIEngine::ScreenSingleton<MainMenuScreen>;
GUIEngine::ListWidget* m_lang_popup;
MainMenuScreen();
void closeLangPopup();
public:
@@ -52,12 +49,6 @@ public:
/** \brief implement callback from parent class GUIEngine::Screen */
virtual void tearDown();
/**
* \brief Called when escape is pressed.
* \return true if the screen should be closed, false if you handled the press another way
*/
virtual bool onEscapePressed();
/** \brief implement callback from parent class GUIEngine::Screen */
virtual void onDisabledItemClicked(const std::string& item);
};