ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/BasiliskII/src/Unix/prefs_editor_gtk.cpp

Comparing BasiliskII/src/Unix/prefs_editor_gtk.cpp (file contents):
Revision 1.27 by gbeauche, 2005-06-06T20:11:50Z vs.
Revision 1.28 by gbeauche, 2005-06-19T15:52:09Z

#	Line 189 | Line 189 | static GtkWidget *make_file_entry(GtkWid
189		return entry;
190		}
191
192	<	static char *get_file_entry_path(GtkWidget *entry)
192	>	static const gchar *get_file_entry_path(GtkWidget *entry)
193		{
194		#ifdef HAVE_GNOMEUI
195		return gnome_file_entry_get_full_path(GNOME_FILE_ENTRY(entry), false);
#	Line 387 | Line 387 | bool PrefsEditor(void)
387		GtkAccelGroup *accel_group = gtk_accel_group_new();
388		GtkItemFactory *item_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", accel_group);
389		gtk_item_factory_create_items(item_factory, sizeof(menu_items) / sizeof(menu_items[0]), menu_items, NULL);
390	+	#if GTK_CHECK_VERSION(1,3,15)
391	+	gtk_window_add_accel_group(GTK_WINDOW(win), accel_group);
392	+	#else
393		gtk_accel_group_attach(accel_group, GTK_OBJECT(win));
394	+	#endif
395		GtkWidget *menu_bar = gtk_item_factory_get_widget(item_factory, "<main>");
396		gtk_widget_show(menu_bar);
397		gtk_box_pack_start(GTK_BOX(box), menu_bar, FALSE, TRUE, 0);
#	Line 442 | Line 446 | struct file_req_assoc {
446		// Volume selected for addition
447		static void add_volume_ok(GtkWidget *button, file_req_assoc *assoc)
448		{
449	<	char *file = gtk_file_selection_get_filename(GTK_FILE_SELECTION(assoc->req));
449	>	gchar *file = (gchar *)gtk_file_selection_get_filename(GTK_FILE_SELECTION(assoc->req));
450		gtk_clist_append(GTK_CLIST(volume_list), &file);
451		gtk_widget_destroy(assoc->req);
452		delete assoc;
#	Line 451 | Line 455 | static void add_volume_ok(GtkWidget *but
455		// Volume selected for creation
456		static void create_volume_ok(GtkWidget *button, file_req_assoc *assoc)
457		{
458	<	char *file = gtk_file_selection_get_filename(GTK_FILE_SELECTION(assoc->req));
458	>	gchar *file = (gchar *)gtk_file_selection_get_filename(GTK_FILE_SELECTION(assoc->req));
459
460	<	char *str = gtk_entry_get_text(GTK_ENTRY(assoc->entry));
460	>	const gchar *str = gtk_entry_get_text(GTK_ENTRY(assoc->entry));
461		int size = atoi(str);
462
463		char cmd[1024];

Diff Legend

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