Attachment #85811 for bug #131689

View | Details | Raw Unified | Return to bug 131689
Collapse All | Expand All




	virtual ~SelectorWidget () {}

protected:
	SelectorWidget (widget* in_widget)
		: SDLWidgetWidget (in_widget)
		, m_callback (NULL)
		{}

class PopupSelectorWidget : public SelectorWidget
{
public:
	PopupSelectorWidget (w_select_popup* select_popup_w)
		: SelectorWidget (select_popup_w)
		, m_select_popup (select_popup_w)
		{ select_popup_w->set_popup_callback (boost::bind(&PopupSelectorWidget::massage_callback, this, _1), NULL); }

class SelectSelectorWidget : public SelectorWidget
{
public:
	SelectSelectorWidget (w_select* select_w)
		: SelectorWidget (select_w)
		, m_select (select_w)
		{ m_select->set_selection_changed_callback (boost::bind(&SelectSelectorWidget::massage_callback, this, _1)); }

class ColourSelectorWidget : public SelectSelectorWidget
{
public:
	ColourSelectorWidget (w_player_color* player_color_w)
		: SelectSelectorWidget (player_color_w) {}

	// We ignore the labels and use swatches of colour instead

class StaticTextWidget : public SDLWidgetWidget
{
public:
	StaticTextWidget (w_static_text* static_text_w)
		: SDLWidgetWidget (static_text_w)
		, m_static_text (static_text_w)
		{}

Lines 838-844 Link Here

(-)AlephOne-20051119-orig/Source_Files/Network/network_dialogs_sdl.cpp (-2 / +2 lines)
838	class SdlGatherDialog : public GatherDialog	838	class SdlGatherDialog : public GatherDialog
839	{	839	{
840	public:	840	public:
841	SdlGatherDialog::SdlGatherDialog()	841	SdlGatherDialog()
842	{	842	{
843	m_dialog.add(new w_static_text("GATHER NETWORK GAME", TITLE_FONT, TITLE_COLOR));	843	m_dialog.add(new w_static_text("GATHER NETWORK GAME", TITLE_FONT, TITLE_COLOR));
844		844
Lines 921-927 Link Here
921	class SdlJoinDialog : public JoinDialog	921	class SdlJoinDialog : public JoinDialog
922	{	922	{
923	public:	923	public:
924	SdlJoinDialog::SdlJoinDialog()	924	SdlJoinDialog()
925	{	925	{
926	m_dialog.add(new w_static_text("JOIN NETWORK GAME", TITLE_FONT, TITLE_COLOR));	926	m_dialog.add(new w_static_text("JOIN NETWORK GAME", TITLE_FONT, TITLE_COLOR));
927	m_dialog.add(new w_spacer());	927	m_dialog.add(new w_spacer());

Lines 95-101 Link Here

(-)AlephOne-20051119-orig/Source_Files/TCPMess/CommunicationsChannel.h (-1 / +1 lines)
95	// Calls back message handlers (if appropriate)	95	// Calls back message handlers (if appropriate)
96	void dispatchIncomingMessages();	96	void dispatchIncomingMessages();
97		97
98	bool CommunicationsChannel::isMessageAvailable();	98	bool isMessageAvailable();
99		99
100	// Call does not return unless (1) times out (NULL); (2) disconnected (NULL); or	100	// Call does not return unless (1) times out (NULL); (2) disconnected (NULL); or
101	// (3) some message received (pointer to inflated message object).	101	// (3) some message received (pointer to inflated message object).

Return to bug 131689

Lines 944-950 Link Here

(-)AlephOne-20051119-orig/Source_Files/Misc/sdl_widgets.h (-5 / +5 lines)
944	virtual ~SelectorWidget () {}	944	virtual ~SelectorWidget () {}
945		945
946	protected:	946	protected:
947	SelectorWidget::SelectorWidget (widget* in_widget)	947	SelectorWidget (widget* in_widget)
948	: SDLWidgetWidget (in_widget)	948	: SDLWidgetWidget (in_widget)
949	, m_callback (NULL)	949	, m_callback (NULL)
950	{}	950	{}
Lines 955-961 Link Here
955	class PopupSelectorWidget : public SelectorWidget	955	class PopupSelectorWidget : public SelectorWidget
956	{	956	{
957	public:	957	public:
958	PopupSelectorWidget::PopupSelectorWidget (w_select_popup* select_popup_w)	958	PopupSelectorWidget (w_select_popup* select_popup_w)
959	: SelectorWidget (select_popup_w)	959	: SelectorWidget (select_popup_w)
960	, m_select_popup (select_popup_w)	960	, m_select_popup (select_popup_w)
961	{ select_popup_w->set_popup_callback (boost::bind(&PopupSelectorWidget::massage_callback, this, _1), NULL); }	961	{ select_popup_w->set_popup_callback (boost::bind(&PopupSelectorWidget::massage_callback, this, _1), NULL); }
Lines 974-980 Link Here
974	class SelectSelectorWidget : public SelectorWidget	974	class SelectSelectorWidget : public SelectorWidget
975	{	975	{
976	public:	976	public:
977	SelectSelectorWidget::SelectSelectorWidget (w_select* select_w)	977	SelectSelectorWidget (w_select* select_w)
978	: SelectorWidget (select_w)	978	: SelectorWidget (select_w)
979	, m_select (select_w)	979	, m_select (select_w)
980	{ m_select->set_selection_changed_callback (boost::bind(&SelectSelectorWidget::massage_callback, this, _1)); }	980	{ m_select->set_selection_changed_callback (boost::bind(&SelectSelectorWidget::massage_callback, this, _1)); }
Lines 996-1002 Link Here
996	class ColourSelectorWidget : public SelectSelectorWidget	996	class ColourSelectorWidget : public SelectSelectorWidget
997	{	997	{
998	public:	998	public:
999	ColourSelectorWidget::ColourSelectorWidget (w_player_color* player_color_w)	999	ColourSelectorWidget (w_player_color* player_color_w)
1000	: SelectSelectorWidget (player_color_w) {}	1000	: SelectSelectorWidget (player_color_w) {}
1001		1001
1002	// We ignore the labels and use swatches of colour instead	1002	// We ignore the labels and use swatches of colour instead
Lines 1028-1034 Link Here
1028	class StaticTextWidget : public SDLWidgetWidget	1028	class StaticTextWidget : public SDLWidgetWidget
1029	{	1029	{
1030	public:	1030	public:
1031	StaticTextWidget::StaticTextWidget (w_static_text* static_text_w)	1031	StaticTextWidget (w_static_text* static_text_w)
1032	: SDLWidgetWidget (static_text_w)	1032	: SDLWidgetWidget (static_text_w)
1033	, m_static_text (static_text_w)	1033	, m_static_text (static_text_w)
1034	{}	1034	{}