[Vice-emu-commit] SF.net SVN: vice-emu:[19039] trunk/vice/src

Revision: 19039
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19039&view=rev
Author:   strik
Date:     2008-07-18 16:26:06 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
2008-07-18  pottendo  <pot...@ao...>

	* arch/unix/x11/gnome/uipalcontrol.c (all): #ifdefed UI elements
	for old PAL emulation as it is replaced by the new PAL Emulation.

	* arch/unix/gui/uipalemu.c: Removed UI for `Old PAL Emu' in case
	of `USE_GNOMEUI.

Modified Paths:
--------------
    trunk/vice/src/ChangeLog
    trunk/vice/src/arch/unix/gui/uipalemu.c
    trunk/vice/src/arch/unix/x11/gnome/uipalcontrol.c

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-07-18 16:24:38 UTC (rev 19038)
+++ trunk/vice/src/ChangeLog	2008-07-18 16:26:06 UTC (rev 19039)
@@ -1,3 +1,11 @@
+2008-07-18  pottendo  <pot...@ao...>
+
+	* arch/unix/x11/gnome/uipalcontrol.c (all): #ifdefed UI elements
+	for old PAL emulation as it is replaced by the new PAL Emulation.
+
+	* arch/unix/gui/uipalemu.c: Removed UI for `Old PAL Emu' in case
+	of `USE_GNOMEUI.
+
 2008-07-16  Spiro Trikaliotis  <spi...@gm...>
 
 	* Version 1.22.27

Modified: trunk/vice/src/arch/unix/gui/uipalemu.c
===================================================================
--- trunk/vice/src/arch/unix/gui/uipalemu.c	2008-07-18 16:24:38 UTC (rev 19038)
+++ trunk/vice/src/arch/unix/gui/uipalemu.c	2008-07-18 16:26:06 UTC (rev 19039)
@@ -135,8 +135,10 @@
     { "--" },
     { N_("*Fast PAL Emulation"),
       (ui_callback_t)radio_PALMode, (ui_callback_data_t)0, NULL },
+#ifndef USE_GNOMEUI
     { N_("*Old Exact PAL Emulation"),
       (ui_callback_t)radio_PALMode, (ui_callback_data_t)1, NULL },
+#endif
     { N_("*New Exact PAL Emulation"),
       (ui_callback_t)radio_PALMode, (ui_callback_data_t)2, NULL },
 #ifndef USE_GNOMEUI

Modified: trunk/vice/src/arch/unix/x11/gnome/uipalcontrol.c
===================================================================
--- trunk/vice/src/arch/unix/x11/gnome/uipalcontrol.c	2008-07-18 16:24:38 UTC (rev 19038)
+++ trunk/vice/src/arch/unix/x11/gnome/uipalcontrol.c	2008-07-18 16:26:06 UTC (rev 19039)
@@ -33,7 +33,10 @@
 #include "resources.h"
 #include "videoarch.h"
 
-static GtkWidget *fake_palemu, *true_palemu, *new_true_palemu;
+static GtkWidget *fake_palemu, *new_true_palemu;
+#ifdef OLD_PAL_EMU_IS_FIXED
+static GtkWidget *true_palemu;
+#endif
 static video_canvas_t *cached_canvas;
 
 typedef struct pal_res_s {
@@ -106,12 +109,10 @@
     if (data == (gpointer) 0)
     {
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[0].w), FALSE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ctrls[1].w), FALSE);
     }
     else
     {
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[0].w), TRUE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ctrls[1].w), TRUE);
     }
     
     if (data == (gpointer) 2)
@@ -200,11 +201,13 @@
     gtk_box_pack_start(GTK_BOX(box), fake_palemu, FALSE, FALSE, 5);
     gtk_widget_show(fake_palemu);
 
+#ifdef OLD_PAL_EMU_IS_FIXED
     true_palemu = gtk_radio_button_new_with_label(
 	gtk_radio_button_get_group(GTK_RADIO_BUTTON(fake_palemu)),
         _("Exact"));
     gtk_box_pack_start(GTK_BOX(box), true_palemu, FALSE, FALSE, 5);
     gtk_widget_show(true_palemu);
+#endif
 
     new_true_palemu = gtk_radio_button_new_with_label(
 	gtk_radio_button_get_group(GTK_RADIO_BUTTON(fake_palemu)),
@@ -220,23 +223,22 @@
     if (v == 0)
     {
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[0].w), FALSE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ctrls[1].w), FALSE);
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[7].w), FALSE);
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[8].w), FALSE);
         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fake_palemu), TRUE);
     }
+#ifdef OLD_PAL_EMU_IS_FIXED
     else if (v == 1)
     {
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[0].w), TRUE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ctrls[1].w), TRUE);
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[7].w), FALSE);
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[8].w), FALSE);
         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(true_palemu), TRUE);
     }
+#endif
     else
     {
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[0].w), TRUE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ctrls[1].w), TRUE);
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[7].w), TRUE);
         gtk_widget_set_sensitive(GTK_WIDGET(ctrls[8].w), TRUE);
         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(new_true_palemu), TRUE);
@@ -247,8 +249,10 @@
     g_signal_connect(G_OBJECT(fake_palemu), "clicked",
                      G_CALLBACK(upd_palmode), (gpointer) 0);
     
+#ifdef OLD_PAL_EMU_IS_FIXED
     g_signal_connect(G_OBJECT(true_palemu), "clicked",
                      G_CALLBACK(upd_palmode), (gpointer) 1);
+#endif
     
     g_signal_connect(G_OBJECT(new_true_palemu), "clicked",
                      G_CALLBACK(upd_palmode), (gpointer) 2);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.