diff -urN thom_orig//makefile.lnx thom_new//makefile.lnx --- thom_orig//makefile.lnx 2003-11-04 19:19:18.000000000 +0100 +++ thom_new//makefile.lnx 2013-10-16 15:10:17.000000000 +0200 @@ -17,15 +17,15 @@ WFLAGS = -Wall -W -Werror -ifdef PGCC - OFLAGS = -mcpu=pentium -O6 -ffast-math -else -ifdef PENTIUMONLY - OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math -else +#ifdef PGCC +# OFLAGS = -mcpu=pentium -O6 -ffast-math +#else +#ifdef PENTIUMONLY +# OFLAGS = -march=pentium -O2 -funroll-loops -ffast-math +#else OFLAGS = -mcpu=pentium -O2 -funroll-loops -ffast-math -endif -endif +#endif +#endif ifdef DEBUGMODE @@ -53,8 +53,11 @@ endif endif -CFLAGS += `gtk-config --cflags` -LIB = `gtk-config --libs` +#CFLAGS += `gtk-config --cflags` +#LIB = `gtk-config --libs` +CFLAGS= `pkg-config gtk+-2.0 --cflags` +LIB= `pkg-config gtk+-2.0 --libs` + # ------ plateform-dependant objects and executables ------ diff -urN thom_orig//src/disk.c thom_new//src/disk.c --- thom_orig//src/disk.c 2004-01-05 09:09:10.000000000 +0100 +++ thom_new//src/disk.c 2013-10-15 22:39:50.000000000 +0200 @@ -81,7 +81,7 @@ /*****************************************/ -#ifdef DEBUG +//#ifdef DEBUG DISK_CTRL_SET_FUNC(cmdr) DISK_CTRL_SET_FUNC(tkr) @@ -89,7 +89,7 @@ DISK_CTRL_SET_FUNC(dr) DISK_CTRL_SET_FUNC(drvr) -#endif +//#endif /***************************************/ diff -urN thom_orig//src/hardware.c thom_new//src/hardware.c --- thom_orig//src/hardware.c 2004-01-05 09:09:10.000000000 +0100 +++ thom_new//src/hardware.c 2013-10-15 22:32:26.000000000 +0200 @@ -274,7 +274,7 @@ } -#ifdef DEBUG /* la fonction n'est pas inlinée */ +//#ifdef DEBUG /* la fonction n'est pas inlinée */ void DrawGPL(int addr) { @@ -289,7 +289,7 @@ to7_DrawGPL(addr, pt, col); } -#endif +//#endif diff -urN thom_orig//src/linux/ufilentry.c thom_new//src/linux/ufilentry.c --- thom_orig//src/linux/ufilentry.c 2004-01-05 09:09:10.000000000 +0100 +++ thom_new//src/linux/ufilentry.c 2013-10-15 22:50:47.000000000 +0200 @@ -72,9 +72,9 @@ object_class=(GtkObjectClass *) class; - file_entry_signals[FILE_SELECTED_SIGNAL]=gtk_signal_new("file_selected", GTK_RUN_FIRST, object_class->type, GTK_SIGNAL_OFFSET(FileEntryClass, file_selected), gtk_signal_default_marshaller, GTK_TYPE_NONE, 0); + file_entry_signals[FILE_SELECTED_SIGNAL]=gtk_signal_new("file_selected", GTK_RUN_FIRST, GTK_CLASS_TYPE(object_class), GTK_SIGNAL_OFFSET(FileEntryClass, file_selected), gtk_signal_default_marshaller, GTK_TYPE_NONE, 0); - gtk_object_class_add_signals(object_class, file_entry_signals, LAST_SIGNAL); + //gtk_object_class_add_signals(object_class, file_entry_signals, LAST_SIGNAL); class->file_selected=NULL; } diff -urN thom_orig//src/linux/ugui.c thom_new//src/linux/ugui.c --- thom_orig//src/linux/ugui.c 2004-01-05 09:09:10.000000000 +0100 +++ thom_new//src/linux/ugui.c 2013-10-15 21:34:59.000000000 +0200 @@ -328,7 +328,7 @@ printf("Initialisation de l'interface..."); /* fenêtre d'affichage */ - window=gtk_window_new(GTK_WINDOW_DIALOG); + window=gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_title(GTK_WINDOW(window), "Thom - Panneau de contrôle"); gtk_window_set_policy(GTK_WINDOW(window), False, False, False); gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER); diff -urN thom_orig//src/linux/umessage.c thom_new//src/linux/umessage.c --- thom_orig//src/linux/umessage.c 2004-01-05 09:09:10.000000000 +0100 +++ thom_new//src/linux/umessage.c 2013-10-15 21:35:25.000000000 +0200 @@ -66,7 +66,7 @@ { GtkWidget *vbox, *button_box, *button; - mesg->window.type=GTK_WINDOW_DIALOG; + mesg->window.type=GTK_WINDOW_TOPLEVEL; gtk_window_set_title(&mesg->window, "Teo"); gtk_window_set_position(&mesg->window, GTK_WIN_POS_CENTER); gtk_signal_connect_object( GTK_OBJECT(&mesg->window), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT(mesg) ); diff -urN thom_orig//src/linux/uquestion.c thom_new//src/linux/uquestion.c --- thom_orig//src/linux/uquestion.c 2004-01-05 09:09:10.000000000 +0100 +++ thom_new//src/linux/uquestion.c 2013-10-15 22:53:49.000000000 +0200 @@ -71,11 +71,11 @@ object_class=(GtkObjectClass *) class; - question_signals[CLICKED_YES_SIGNAL]=gtk_signal_new("clicked_yes", GTK_RUN_FIRST, object_class->type, GTK_SIGNAL_OFFSET(QuestionClass, clicked_yes), gtk_signal_default_marshaller, GTK_TYPE_NONE, 0); + question_signals[CLICKED_YES_SIGNAL]=gtk_signal_new("clicked_yes", GTK_RUN_FIRST, GTK_CLASS_TYPE(object_class), GTK_SIGNAL_OFFSET(QuestionClass, clicked_yes), gtk_signal_default_marshaller, GTK_TYPE_NONE, 0); - question_signals[CLICKED_NO_SIGNAL]=gtk_signal_new("clicked_no", GTK_RUN_FIRST, object_class->type, GTK_SIGNAL_OFFSET(QuestionClass, clicked_no), gtk_signal_default_marshaller, GTK_TYPE_NONE, 0); + question_signals[CLICKED_NO_SIGNAL]=gtk_signal_new("clicked_no", GTK_RUN_FIRST, GTK_CLASS_TYPE(object_class), GTK_SIGNAL_OFFSET(QuestionClass, clicked_no), gtk_signal_default_marshaller, GTK_TYPE_NONE, 0); - gtk_object_class_add_signals(object_class, question_signals, LAST_SIGNAL); + //gtk_object_class_add_signals(object_class, question_signals, LAST_SIGNAL); class->clicked_yes=NULL; class->clicked_no=NULL; @@ -109,7 +109,7 @@ { GtkWidget *vbox, *button_box, *button_yes, *button_no; - quest->window.type=GTK_WINDOW_DIALOG; + quest->window.type=GTK_WINDOW_TOPLEVEL; gtk_window_set_title(&quest->window, "Thom - confirmation"); gtk_window_set_position(&quest->window, GTK_WIN_POS_CENTER); gtk_signal_connect_object( GTK_OBJECT(&quest->window), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT(quest) ); diff -urN thom_orig//src/mc68xx/mc6809.c thom_new//src/mc68xx/mc6809.c --- thom_orig//src/mc68xx/mc6809.c 2003-11-04 19:19:18.000000000 +0100 +++ thom_new//src/mc68xx/mc6809.c 2013-10-15 22:38:32.000000000 +0200 @@ -1843,9 +1843,9 @@ /* broche de demande d'interruption ordinaire */ int mc6809_irq; -#ifdef DEBUG +//#ifdef DEBUG FILE *mc6809_ftrace=NULL; -#endif +//#endif @@ -2000,10 +2000,10 @@ if (mc6809_irq) do_irq(); -#ifdef DEBUG +//#ifdef DEBUG if (mc6809_ftrace) fprintf(mc6809_ftrace, "pc: %04X\n", pc); -#endif +//#endif /* on remplit le buffer de fetch */ FetchInstr(pc, fetch_buffer); @@ -2040,10 +2040,10 @@ if (mc6809_irq) do_irq(); -#ifdef DEBUG +//#ifdef DEBUG if (mc6809_ftrace) fprintf(mc6809_ftrace, "pc: %04X\n", pc); -#endif +//#endif /* on remplit le buffer de fetch */ FetchInstr(pc, fetch_buffer); diff -urN thom_orig//src/mc68xx/mc6821.c thom_new//src/mc68xx/mc6821.c --- thom_orig//src/mc68xx/mc6821.c 2003-11-04 19:19:18.000000000 +0100 +++ thom_new//src/mc68xx/mc6821.c 2013-10-15 22:36:38.000000000 +0200 @@ -31,7 +31,7 @@ */ -#ifdef DEBUG +//#ifdef DEBUG #include "mc68xx/mc6821.h" @@ -107,4 +107,4 @@ port->idr = idr; } -#endif +//#endif diff -urN thom_orig//src/mc68xx/mc6846.c thom_new//src/mc68xx/mc6846.c --- thom_orig//src/mc68xx/mc6846.c 2003-11-04 19:19:18.000000000 +0100 +++ thom_new//src/mc68xx/mc6846.c 2013-10-15 22:35:52.000000000 +0200 @@ -52,7 +52,7 @@ } -#ifdef DEBUG /* les fonctions ne sont pas inlinées */ +//#ifdef DEBUG /* les fonctions ne sont pas inlinées */ void mc6846_SetTcr(struct MC6846_PIA *mc6846, int val) { @@ -165,7 +165,7 @@ mc6846->prc = (mc6846->prc&(mask^0xFF)) | (val&mask); } -#endif +//#endif