--- np2/x11/gtk/Attic/dialog_config.c	2004/05/09 15:47:54	1.5
+++ np2/x11/gtk/Attic/dialog_config.c	2004/08/14 03:12:51	1.8
@@ -65,7 +65,7 @@ static GtkWidget *baseclock_entry;
 static GtkWidget *clockmult_entry;
 static GtkWidget *buffer_entry;
 static GtkWidget *resume_checkbutton;
-#if defined(__GNUC__) && (defined(i386) || defined(__i386__))
+#if defined(GCC_CPU_ARCH_IA32)
 static GtkWidget *disablemmx_checkbutton;
 #endif
 static const char *arch;
@@ -75,11 +75,11 @@ static int rate;
 static void
 ok_button_clicked(GtkButton *b, gpointer d)
 {
-	gchar *bufp = gtk_entry_get_text(GTK_ENTRY(buffer_entry));
-	gchar *base = gtk_entry_get_text(GTK_ENTRY(baseclock_entry));
-	gchar *multp = gtk_entry_get_text(GTK_ENTRY(clockmult_entry));
+	const gchar *bufp = gtk_entry_get_text(GTK_ENTRY(buffer_entry));
+	const gchar *base = gtk_entry_get_text(GTK_ENTRY(baseclock_entry));
+	const gchar *multp = gtk_entry_get_text(GTK_ENTRY(clockmult_entry));
 	gint resume = GTK_TOGGLE_BUTTON(resume_checkbutton)->active;
-#if defined(__GNUC__) && (defined(i386) || defined(__i386__))
+#if defined(GCC_CPU_ARCH_IA32)
 	gint disablemmx = GTK_TOGGLE_BUTTON(disablemmx_checkbutton)->active;
 #endif
 	guint bufsize;
@@ -147,7 +147,7 @@ ok_button_clicked(GtkButton *b, gpointer
 		soundrenewal = 1;
 	}
 
-#if defined(__GNUC__) && (defined(i386) || defined(__i386__))
+#if defined(GCC_CPU_ARCH_IA32)
 	if (!(mmxflag & MMXFLAG_NOTSUPPORT)) {
 		disablemmx = disablemmx ? MMXFLAG_DISABLE : 0;
 		if (np2oscfg.disablemmx != disablemmx) {
@@ -202,8 +202,8 @@ rate_radiobutton_clicked(GtkButton *b, g
 static void
 clock_changed(GtkEditable *e, gpointer d)
 {
-	gchar *base = gtk_entry_get_text(GTK_ENTRY(baseclock_entry));
-	gchar *multp = gtk_entry_get_text(GTK_ENTRY(clockmult_entry));
+	const gchar *base = gtk_entry_get_text(GTK_ENTRY(baseclock_entry));
+	const gchar *multp = gtk_entry_get_text(GTK_ENTRY(clockmult_entry));
 	guint mult = milstr_solveINT(multp);
 	gchar buf[80];
 	gint clock;
@@ -256,7 +256,7 @@ create_configure_dialog(void)
 
 	uninstall_idle_process();
 
-	config_dialog = gtk_window_new(GTK_WINDOW_DIALOG);
+	config_dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_title(GTK_WINDOW(config_dialog), "Configure");
 	gtk_window_set_position(GTK_WINDOW(config_dialog), GTK_WIN_POS_CENTER);
 	gtk_window_set_modal(GTK_WINDOW(config_dialog), TRUE);
@@ -486,8 +486,11 @@ create_configure_dialog(void)
 	if (np2oscfg.resume) {
 		gtk_signal_emit_by_name(GTK_OBJECT(resume_checkbutton), "clicked");
 	}
+#if defined(CPUCORE_IA32)
+	gtk_widget_set_sensitive(resume_checkbutton, FALSE);
+#endif
 
-#if defined(__GNUC__) && (defined(i386) || defined(__i386__))
+#if defined(GCC_CPU_ARCH_IA32)
 	/* Disable MMX */
 	disablemmx_checkbutton = gtk_check_button_new_with_label("Disable MMX");
 	gtk_widget_show(disablemmx_checkbutton);