Bugfix: tabs could not be selected anymore. Reason was a change
from std::string & to const std::string & in r10008, and as a result a virtual function was not overloaded anymore. This patch changes all transmitEvent functions to use const std::string &. git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10021 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
parent
511d210818
commit
492b58f8ce
@ -206,9 +206,7 @@ namespace GUIEngine
|
||||
|
||||
/** \brief to spice up a bit the loading icon : add icons to the loading screen */
|
||||
void addLoadingIcon(irr::video::ITexture* icon);
|
||||
|
||||
//void transmitEvent(Widget* widget, std::string& name, const int playerID);
|
||||
|
||||
|
||||
/** \brief Finds a widget from its name (PROP_ID) in the current screen/dialog
|
||||
* \param name the name (PROP_ID) of the widget to search for
|
||||
* \return the widget that bears that name, or NULL if it was not found
|
||||
|
@ -544,7 +544,10 @@ namespace GUIEngine
|
||||
this call. Must return whether main (GUI engine user) event callback should be notified or not.
|
||||
Note that in the case of a hierarchy of widgets (with m_event_handler), only the topmost widget
|
||||
of the chain decides whether the main handler is notified; return value is not read for others. */
|
||||
virtual EventPropagation transmitEvent(Widget* w, std::string& originator, const int playerID) { return EVENT_LET; }
|
||||
virtual EventPropagation transmitEvent(Widget* w,
|
||||
const std::string& originator,
|
||||
const int playerID)
|
||||
{ return EVENT_LET; }
|
||||
|
||||
/**
|
||||
* \brief Create and add the irrLicht widget(s) associated with this object.
|
||||
|
@ -46,7 +46,9 @@ void CheckBoxWidget::add()
|
||||
m_element->setTabGroup(false);
|
||||
}
|
||||
// -----------------------------------------------------------------------------
|
||||
EventPropagation CheckBoxWidget::transmitEvent(Widget* w, std::string& originator, const int playerID)
|
||||
EventPropagation CheckBoxWidget::transmitEvent(Widget* w,
|
||||
const std::string& originator,
|
||||
const int playerID)
|
||||
{
|
||||
assert(m_magic_number == 0xCAFEC001);
|
||||
|
||||
|
@ -33,7 +33,9 @@ namespace GUIEngine
|
||||
class CheckBoxWidget : public Widget
|
||||
{
|
||||
bool m_state;
|
||||
EventPropagation transmitEvent(Widget* w, std::string& originator, const int playerID);
|
||||
EventPropagation transmitEvent(Widget* w,
|
||||
const std::string& originator,
|
||||
const int playerID);
|
||||
|
||||
public:
|
||||
|
||||
|
@ -628,7 +628,9 @@ EventPropagation DynamicRibbonWidget::leftPressed(const int playerID)
|
||||
return EVENT_LET;
|
||||
}
|
||||
// -----------------------------------------------------------------------------
|
||||
EventPropagation DynamicRibbonWidget::transmitEvent(Widget* w, std::string& originator, const int playerID)
|
||||
EventPropagation DynamicRibbonWidget::transmitEvent(Widget* w,
|
||||
const std::string& originator,
|
||||
const int playerID)
|
||||
{
|
||||
assert(m_magic_number == 0xCAFEC001);
|
||||
|
||||
|
@ -167,7 +167,7 @@ namespace GUIEngine
|
||||
/** Callbacks */
|
||||
virtual void add();
|
||||
virtual EventPropagation mouseHovered(Widget* child, const int playerID);
|
||||
virtual EventPropagation transmitEvent(Widget* w, std::string& originator, const int playerID);
|
||||
virtual EventPropagation transmitEvent(Widget* w, const std::string& originator, const int playerID);
|
||||
|
||||
bool findItemInRows(const char* name, int* p_row, int* p_id);
|
||||
|
||||
|
@ -359,7 +359,9 @@ void ListWidget::markItemBlue(const int id, bool blue)
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
EventPropagation ListWidget::transmitEvent(Widget* w, std::string& originator, const int playerID)
|
||||
EventPropagation ListWidget::transmitEvent(Widget* w,
|
||||
const std::string& originator,
|
||||
const int playerID)
|
||||
{
|
||||
assert(m_magic_number == 0xCAFEC001);
|
||||
|
||||
|
@ -208,7 +208,9 @@ namespace GUIEngine
|
||||
}
|
||||
|
||||
/** Override callback from Widget */
|
||||
virtual EventPropagation transmitEvent(Widget* w, std::string& originator, const int playerID);
|
||||
virtual EventPropagation transmitEvent(Widget* w,
|
||||
const std::string& originator,
|
||||
const int playerID);
|
||||
|
||||
void setColumnListener(IListWidgetHeaderListener* listener)
|
||||
{
|
||||
|
@ -268,7 +268,9 @@ EventPropagation SpinnerWidget::leftPressed(const int playerID)
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
EventPropagation SpinnerWidget::transmitEvent(Widget* w, std::string& originator, const int playerID)
|
||||
EventPropagation SpinnerWidget::transmitEvent(Widget* w,
|
||||
const std::string& originator,
|
||||
const int playerID)
|
||||
{
|
||||
assert(m_magic_number == 0xCAFEC001);
|
||||
|
||||
|
@ -73,7 +73,9 @@ namespace GUIEngine
|
||||
bool m_warp_around;
|
||||
|
||||
/** \brief implementing method from base class Widget */
|
||||
virtual EventPropagation transmitEvent(Widget* w, std::string& originator, const int playerID);
|
||||
virtual EventPropagation transmitEvent(Widget* w,
|
||||
const std::string& originator,
|
||||
const int playerID);
|
||||
|
||||
/** \brief implementing method from base class Widget */
|
||||
virtual EventPropagation rightPressed(const int playerID);
|
||||
|
Loading…
x
Reference in New Issue
Block a user