55 lines
2.1 KiB
Plaintext
55 lines
2.1 KiB
Plaintext
Index: Source_Files/Misc/sdl_widgets.h
|
|
--- Source_Files/Misc/sdl_widgets.h.orig
|
|
+++ Source_Files/Misc/sdl_widgets.h
|
|
@@ -288,12 +288,12 @@ class w_button_base : public widget { (protected)
|
|
|
|
class w_button : public w_button_base {
|
|
public:
|
|
- w_button(const char *text, action_proc proc = NULL, void *arg = NULL) : w_button_base(text, proc, arg, BUTTON_WIDGET) {}
|
|
+ w_button(const char *text, action_proc proc = 0, void *arg = NULL) : w_button_base(text, proc, arg, BUTTON_WIDGET) {}
|
|
};
|
|
|
|
class w_tiny_button : public w_button_base {
|
|
public:
|
|
- w_tiny_button(const char *text, action_proc proc = NULL, void *arg = NULL) : w_button_base(text, proc, arg, TINY_BUTTON) {}
|
|
+ w_tiny_button(const char *text, action_proc proc = 0, void *arg = NULL) : w_button_base(text, proc, arg, TINY_BUTTON) {}
|
|
};
|
|
|
|
class w_hyperlink : public w_button_base {
|
|
@@ -854,7 +854,7 @@ class w_string_list : public w_list<string> { (private
|
|
|
|
class w_select_popup : public w_select_button {
|
|
public:
|
|
- w_select_popup (action_proc p = NULL, void *a = NULL);
|
|
+ w_select_popup (action_proc p = 0, void *a = NULL);
|
|
|
|
void set_labels (const vector<string>& inLabels);/* {labels = inLabels;}*/
|
|
void set_selection (int value);
|
|
@@ -1131,7 +1131,7 @@ class ToggleWidget : public SDLWidgetWidget, public Bi
|
|
ToggleWidget (w_toggle* toggle)
|
|
: SDLWidgetWidget (toggle)
|
|
, m_toggle (toggle)
|
|
- , m_callback (NULL)
|
|
+ , m_callback (0)
|
|
{ m_toggle->set_selection_changed_callback (boost::bind(&ToggleWidget::massage_callback, this, _1)); }
|
|
|
|
void set_callback (ControlHitCallback callback) { m_callback = callback; }
|
|
@@ -1169,7 +1169,7 @@ class SelectorWidget : public SDLWidgetWidget, public
|
|
protected:
|
|
SelectorWidget (widget* in_widget)
|
|
: SDLWidgetWidget (in_widget)
|
|
- , m_callback (NULL)
|
|
+ , m_callback (0)
|
|
{}
|
|
|
|
ControlHitCallback m_callback;
|
|
@@ -1253,7 +1253,7 @@ class ButtonWidget : public SDLWidgetWidget (public)
|
|
ButtonWidget (w_button_base* button)
|
|
: SDLWidgetWidget (button)
|
|
, m_button (button)
|
|
- , m_callback (NULL)
|
|
+ , m_callback (0)
|
|
{ m_button->set_callback (bounce_callback, this); }
|
|
|
|
void set_callback (ControlHitCallback callback) { m_callback = callback; }
|