ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/proj/RenegadeMapSelector/MapSelector.cpp

Comparing trunk/RenegadeMapSelector/MapSelector.cpp (file contents):
Revision 86 by douglas, 2003-03-15T16:43:53-08:00 vs.
Revision 87 by douglas, 2003-03-15T17:19:37-08:00

#	Line 4 | Line 4
4		//
5		// MapSelector.cpp
6
7	+	#include "MapSelector.h"
8	+
9		#ifndef _WIN32
10
11	<	static void destruct(GtkWidget* widget, gpointer data)
11	>	void destruct(GtkWidget* widget, MapSelector* data)
12		{
13		gtk_main_quit();
14		}
15
16	<	static void done(GtkWidget* widget, gpointer data)
16	>	void done(GtkWidget* widget, MapSelector* data)
17		{
18		if (true)
19		{
20	<	message(GTK_WINDOW(window), "You need at least one map.", "No Maps",
21	<	GTK_MESSAGE_WARNING);
20	>	message(GTK_WINDOW(data->window), "You need at least one map.",
21	>	"No Maps", GTK_MESSAGE_WARNING);
22		}
23		else
24		{
#	Line 28 | Line 30 | static void done(GtkWidget* widget, gpoi
30		}
31		}
32
33	<	static void mapAdd(GtkWidget* widget, gpointer data)
33	>	void mapAdd(GtkWidget* widget, MapSelector* data)
34		{
35		cout << "STUB: add\n\a" << flush;
36		}
37
38	<	static void mapRemove(GtkWidget* widget, gpointer data)
38	>	void mapRemove(GtkWidget* widget, MapSelector* data)
39		{
40		cout << "STUB: remove\n\a" << flush;
41		}
42
43	<	static void mapUp(GtkWidget* widget, gpointer data)
43	>	void mapUp(GtkWidget* widget, MapSelector* data)
44		{
45		cout << "STUB: up\n\a" << flush;
46		}
47
48	<	static void mapDown(GtkWidget* widget, gpointer data)
48	>	void mapDown(GtkWidget* widget, MapSelector* data)
49		{
50		cout << "STUB: down\n\a" << flush;
51		}
#	Line 55 | Line 57 | MapSelector::MapSelector()
57		gtk_window_set_title(GTK_WINDOW(window), "Renegade Map Selector");
58		gtk_window_set_resizable(GTK_WINDOW(window), false);
59		g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(destruct),
60	<	NULL);
60	>	this);
61
62		GtkWidget* vertical = gtk_vbox_new(false, 0);
63		GtkWidget* horizontal = gtk_hbox_new(false, 9);
#	Line 73 | Line 75 | MapSelector::MapSelector()
75
76		add = gtk_button_new_with_mnemonic("_Add");
77
78	<	g_signal_connect(G_OBJECT(add), "clicked", G_CALLBACK(mapAdd), NULL);
78	>	g_signal_connect(G_OBJECT(add), "clicked", G_CALLBACK(mapAdd), this);
79		gtk_widget_set_sensitive(add, false);
80
81		remove = gtk_button_new_with_mnemonic("_Remove");
82
83	<	g_signal_connect(G_OBJECT(remove), "clicked", G_CALLBACK(mapRemove), NULL);
83	>	g_signal_connect(G_OBJECT(remove), "clicked", G_CALLBACK(mapRemove), this);
84		gtk_widget_set_sensitive(remove, false);
85
86		GtkWidget* middle = gtk_vbutton_box_new();
#	Line 89 | Line 91 | MapSelector::MapSelector()
91
92		up = gtk_button_new_with_mnemonic("_Up");
93
94	<	g_signal_connect(G_OBJECT(up), "clicked", G_CALLBACK(mapUp), NULL);
94	>	g_signal_connect(G_OBJECT(up), "clicked", G_CALLBACK(mapUp), this);
95		gtk_widget_set_sensitive(up, false);
96
97		down = gtk_button_new_with_mnemonic("_Down");
98
99	<	g_signal_connect(G_OBJECT(down), "clicked", G_CALLBACK(mapDown), NULL);
99	>	g_signal_connect(G_OBJECT(down), "clicked", G_CALLBACK(mapDown), this);
100		gtk_widget_set_sensitive(down, false);
101
102		GtkWidget* right = gtk_frame_new("Selected Maps");
#	Line 111 | Line 113 | MapSelector::MapSelector()
113
114		GtkWidget* ok = gtk_button_new_from_stock(GTK_STOCK_OK);
115
116	<	g_signal_connect(G_OBJECT(ok), "clicked", G_CALLBACK(done), NULL);
116	>	g_signal_connect(G_OBJECT(ok), "clicked", G_CALLBACK(done), this);
117
118		GtkWidget* cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
119
120	<	g_signal_connect(G_OBJECT(cancel), "clicked", G_CALLBACK(destruct), NULL);
120	>	g_signal_connect(G_OBJECT(cancel), "clicked", G_CALLBACK(destruct), this);
121
122		// pack
123		gtk_container_add(GTK_CONTAINER(vertical), horizontal);

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines