[70725] trunk/dports/math/tiemu3

and.damore at macports.org and.damore at macports.org
Thu Aug 19 03:47:37 PDT 2010


Revision: 70725
          http://trac.macports.org/changeset/70725
Author:   and.damore at macports.org
Date:     2010-08-19 03:47:34 -0700 (Thu, 19 Aug 2010)
Log Message:
-----------
fixed #25649, patched deprecated GTK calls

Modified Paths:
--------------
    trunk/dports/math/tiemu3/Portfile

Added Paths:
-----------
    trunk/dports/math/tiemu3/files/patch-keynames-c.diff
    trunk/dports/math/tiemu3/files/patch-tiemu3.diff

Removed Paths:
-------------
    trunk/dports/math/tiemu3/files/patch-keynames.c

Modified: trunk/dports/math/tiemu3/Portfile
===================================================================
--- trunk/dports/math/tiemu3/Portfile	2010-08-19 03:15:35 UTC (rev 70724)
+++ trunk/dports/math/tiemu3/Portfile	2010-08-19 10:47:34 UTC (rev 70725)
@@ -34,7 +34,8 @@
                     port:gtk2 \
                     port:libglade2
 
-patchfiles			patch-keynames.c
+patchfiles			patch-keynames-c.diff \
+                    patch-tiemu3.diff
 patch.pre_args      -p1
 
 configure.args-append		--without-kde --disable-debugger --disable-gdb

Copied: trunk/dports/math/tiemu3/files/patch-keynames-c.diff (from rev 70724, trunk/dports/math/tiemu3/files/patch-keynames.c)
===================================================================
--- trunk/dports/math/tiemu3/files/patch-keynames-c.diff	                        (rev 0)
+++ trunk/dports/math/tiemu3/files/patch-keynames-c.diff	2010-08-19 10:47:34 UTC (rev 70725)
@@ -0,0 +1,12 @@
+--- tiemu-3.02.orig/src/gui/calc/keynames.c	2009-05-23 11:48:50.000000000 +0200
++++ tiemu-3.02/src/gui/calc/keynames.c	2009-05-23 11:49:51.000000000 +0200
+@@ -135,9 +135,7 @@
+ 	{ PCKEY_CLEAR, "PCKEY_CLEAR" },
+ 	{ PCKEY_RETURN, "PCKEY_RETURN" },
+ 	{ PCKEY_SHIFT_L, "PCKEY_SHIFT_L" },
+-	{ PCKEY_SHIFT_R, "PCKEY_SHIFT_R" },
+ 	{ PCKEY_CONTROL_L, "PCKEY_CONTROL_L" },
+-	{ PCKEY_CONTROL_R, "PCKEY_CONTROL_R" },
+ 	{ PCKEY_MENU, "PCKEY_MENU" },
+ 	{ PCKEY_PAUSE, "PCKEY_PAUSE" },
+ 	{ PCKEY_CAPITAL, "PCKEY_CAPITAL" },

Deleted: trunk/dports/math/tiemu3/files/patch-keynames.c
===================================================================
--- trunk/dports/math/tiemu3/files/patch-keynames.c	2010-08-19 03:15:35 UTC (rev 70724)
+++ trunk/dports/math/tiemu3/files/patch-keynames.c	2010-08-19 10:47:34 UTC (rev 70725)
@@ -1,12 +0,0 @@
---- tiemu-3.02.orig/src/gui/calc/keynames.c	2009-05-23 11:48:50.000000000 +0200
-+++ tiemu-3.02/src/gui/calc/keynames.c	2009-05-23 11:49:51.000000000 +0200
-@@ -135,9 +135,7 @@
- 	{ PCKEY_CLEAR, "PCKEY_CLEAR" },
- 	{ PCKEY_RETURN, "PCKEY_RETURN" },
- 	{ PCKEY_SHIFT_L, "PCKEY_SHIFT_L" },
--	{ PCKEY_SHIFT_R, "PCKEY_SHIFT_R" },
- 	{ PCKEY_CONTROL_L, "PCKEY_CONTROL_L" },
--	{ PCKEY_CONTROL_R, "PCKEY_CONTROL_R" },
- 	{ PCKEY_MENU, "PCKEY_MENU" },
- 	{ PCKEY_PAUSE, "PCKEY_PAUSE" },
- 	{ PCKEY_CAPITAL, "PCKEY_CAPITAL" },

Added: trunk/dports/math/tiemu3/files/patch-tiemu3.diff
===================================================================
--- trunk/dports/math/tiemu3/files/patch-tiemu3.diff	                        (rev 0)
+++ trunk/dports/math/tiemu3/files/patch-tiemu3.diff	2010-08-19 10:47:34 UTC (rev 70725)
@@ -0,0 +1,446 @@
+diff -x .svn -ru tiemu-3.02-orig/src/gui/calc/calc.c tiemu-3.02/src/gui/calc/calc.c
+--- tiemu-3.02-orig/src/gui/calc/calc.c	2010-08-19 12:25:41.000000000 +0200
++++ tiemu-3.02/src/gui/calc/calc.c	2010-08-19 12:28:34.000000000 +0200
+@@ -313,7 +313,7 @@
+ {
+     gdk_draw_pixmap(
+         widget->window,
+-		widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
++		widget->style->fg_gc[gtk_widget_get_state (widget)],
+ 		pixmap,
+ 		event->area.x, event->area.y,
+ 		event->area.x, event->area.y,
+diff -x .svn -ru tiemu-3.02-orig/src/gui/calc/screen.c tiemu-3.02/src/gui/calc/screen.c
+--- tiemu-3.02-orig/src/gui/calc/screen.c	2010-08-19 12:25:41.000000000 +0200
++++ tiemu-3.02/src/gui/calc/screen.c	2010-08-19 12:28:37.000000000 +0200
+@@ -187,7 +187,7 @@
+ 	skin_infos.image = gdk_pixbuf_scale_simple(skin_infos.raw, wr.wr.w, wr.wr.h, GDK_INTERP_NEAREST);
+ 
+ 	// and draw image into pixmap (next, into window on expose event)
+-    gdk_draw_pixbuf(pixmap, main_wnd->style->fg_gc[GTK_WIDGET_STATE(main_wnd)],
++    gdk_draw_pixbuf(pixmap, main_wnd->style->fg_gc[gtk_widget_get_state(main_wnd)],
+ 		  skin_infos.image, 0, 0, 0, 0, -1, -1, GDK_RGB_DITHER_NONE, 0, 0);
+ 	gdk_window_invalidate_rect(main_wnd->window, &wr.gr, FALSE);
+ }
+@@ -204,7 +204,7 @@
+ 		gdk_pixbuf_scale_simple(skin_infos.raw, sr.w, sr.h, GDK_INTERP_NEAREST);
+ 
+ 	// and draw
+-	gdk_draw_pixbuf(pixmap, main_wnd->style->fg_gc[GTK_WIDGET_STATE(main_wnd)],
++	gdk_draw_pixbuf(pixmap, main_wnd->style->fg_gc[gtk_widget_get_state(main_wnd)],
+ 		  skin_infos.image, ls.x, ls.y, lr.x, lr.y, lr.w, lr.h, GDK_RGB_DITHER_NONE, 0, 0);
+ 	gtk_widget_queue_draw_area(area, lr.x, lr.y, lr.w, lr.h);
+ }
+@@ -324,7 +324,7 @@
+ 			skin_infos.image = gdk_pixbuf_scale_simple(lcd, lr.w, lr.h, GDK_INTERP_NEAREST);
+ 
+ 			// and draw image into pixmap (next, into window on expose event)
+-			gdk_draw_pixbuf(pixmap, main_wnd->style->fg_gc[GTK_WIDGET_STATE(main_wnd)],
++			gdk_draw_pixbuf(pixmap, main_wnd->style->fg_gc[gtk_widget_get_state(main_wnd)],
+ 			 skin_infos.image, src.x, src.y, lr.x, lr.y, src.w, src.h,
+ 			  GDK_RGB_DITHER_NONE, 0, 0);
+ 			gtk_widget_queue_draw_area(area, lr.x, lr.y, src.w, src.h);
+@@ -332,7 +332,7 @@
+ 		else
+ 		{
+ 			// and draw image into pixmap (next, into window on expose event)
+-			gdk_draw_pixbuf(pixmap, main_wnd->style->fg_gc[GTK_WIDGET_STATE(main_wnd)],
++			gdk_draw_pixbuf(pixmap, main_wnd->style->fg_gc[gtk_widget_get_state(main_wnd)],
+ 			  lcd_mem, src.x, src.y, lr.x, lr.y, src.w, src.h,
+ 			  GDK_RGB_DITHER_NONE, 0, 0);
+ 			gtk_widget_queue_draw_area(area, lr.x, lr.y, src.w, src.h);
+diff -x .svn -ru tiemu-3.02-orig/src/gui/debugger/dbg_all.c tiemu-3.02/src/gui/debugger/dbg_all.c
+--- tiemu-3.02-orig/src/gui/debugger/dbg_all.c	2010-08-19 12:25:41.000000000 +0200
++++ tiemu-3.02/src/gui/debugger/dbg_all.c	2010-08-19 12:33:04.000000000 +0200
+@@ -81,21 +81,21 @@
+ 
+ void gtk_debugger_refresh(void)
+ {	
+-	if(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.regs))
++	if(options3.dbg_dock || gtk_widget_get_visible(dbgw.regs))
+ 		dbgregs_refresh_window();
+-	if(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.mem))
++	if(options3.dbg_dock || gtk_widget_get_visible(dbgw.mem))
+ 		dbgmem_refresh_window();
+-	if(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.bkpts))
++	if(options3.dbg_dock || gtk_widget_get_visible(dbgw.bkpts))
+ 		dbgbkpts_refresh_window();
+-	if(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.pclog))
++	if(options3.dbg_dock || gtk_widget_get_visible(dbgw.pclog))
+ 		dbgpclog_refresh_window();
+-	if(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.code))
++	if(options3.dbg_dock || gtk_widget_get_visible(dbgw.code))
+ 		dbgcode_refresh_window();
+-    if(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.stack))
++    if(options3.dbg_dock || gtk_widget_get_visible(dbgw.stack))
+ 		dbgstack_refresh_window();
+-	if(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.heap))
++	if(options3.dbg_dock || gtk_widget_get_visible(dbgw.heap))
+ 		dbgheap_refresh_window();
+-	if(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.iop))
++	if(options3.dbg_dock || gtk_widget_get_visible(dbgw.iop))
+ 		dbgiop_refresh_window();
+ }
+ 
+@@ -147,7 +147,7 @@
+ 	gtk_debugger_refresh();
+ 
+ 	// enable the debugger if GDB disabled it
+-	if (!options3.dbg_dock && !GTK_WIDGET_SENSITIVE(dbgw.regs))
++	if (!options3.dbg_dock && !gtk_widget_get_sensitive(dbgw.regs))
+ 		gtk_debugger_enable();
+ 
+ 	// handle automatic debugging requests
+@@ -164,7 +164,7 @@
+ 
+ 			ti68k_bkpt_get_pgmentry_offset(id, &handle, &offset);
+ 			ti68k_bkpt_del_pgmentry(handle);
+-			if(GTK_WIDGET_VISIBLE(dbgw.bkpts))
++			if(gtk_widget_get_visible(dbgw.bkpts))
+ 				dbgbkpts_refresh_window();
+ 
+ 			delete_command(NULL, 0);
+@@ -244,4 +244,4 @@
+ 		dbgdock_set_sensitivity(TRUE);
+ 	else
+ 		dbgwnds_set_sensitivity(TRUE);
+-}
+\ No newline at end of file
++}
+diff -x .svn -ru tiemu-3.02-orig/src/gui/debugger/dbg_bkpts.c tiemu-3.02/src/gui/debugger/dbg_bkpts.c
+--- tiemu-3.02-orig/src/gui/debugger/dbg_bkpts.c	2010-08-19 12:25:41.000000000 +0200
++++ tiemu-3.02/src/gui/debugger/dbg_bkpts.c	2010-08-19 12:31:13.000000000 +0200
+@@ -388,7 +388,7 @@
+ 		gtk_window_iconify(GTK_WINDOW(wnd));
+ #endif
+ 
+-	if(!GTK_WIDGET_VISIBLE(dbgw.bkpts) && !options3.bkpts.closed)
++	if(!gtk_widget_get_visible(dbgw.bkpts) && !options3.bkpts.closed)
+ 		gtk_widget_show(wnd);
+ 
+ 	return wnd;
+diff -x .svn -ru tiemu-3.02-orig/src/gui/debugger/dbg_code.c tiemu-3.02/src/gui/debugger/dbg_code.c
+--- tiemu-3.02-orig/src/gui/debugger/dbg_code.c	2010-08-19 12:25:41.000000000 +0200
++++ tiemu-3.02/src/gui/debugger/dbg_code.c	2010-08-19 12:33:04.000000000 +0200
+@@ -1096,7 +1096,7 @@
+ 
+ int dbgcode_quit_enabled(void)
+ {
+-	return GTK_WIDGET_SENSITIVE(mi.m8);
++	return gtk_widget_get_sensitive(mi.m8);
+ }
+ 
+ static int close_debugger_wrapper(gpointer data)
+diff -x .svn -ru tiemu-3.02-orig/src/gui/debugger/dbg_dock.c tiemu-3.02/src/gui/debugger/dbg_dock.c
+--- tiemu-3.02-orig/src/gui/debugger/dbg_dock.c	2010-08-19 12:25:41.000000000 +0200
++++ tiemu-3.02/src/gui/debugger/dbg_dock.c	2010-08-19 12:31:13.000000000 +0200
+@@ -151,22 +151,22 @@
+ 
+ void dbgdock_show_all(int all)
+ {
+-	if(!GTK_WIDGET_VISIBLE(dbgw.dock) && all)
++	if(!gtk_widget_get_visible(dbgw.dock) && all)
+         gtk_widget_show(dbgw.dock);
+ 
+-	if(GTK_WIDGET_VISIBLE(dbgw.iop))
++	if(gtk_widget_get_visible(dbgw.iop))
+         gtk_window_iconify(GTK_WINDOW(dbgw.iop));
+-	if(GTK_WIDGET_VISIBLE(dbgw.pclog))
++	if(gtk_widget_get_visible(dbgw.pclog))
+         gtk_window_iconify(GTK_WINDOW(dbgw.pclog));
+ }
+ 
+ void dbgdock_hide_all(int all)
+ {
+-	if(GTK_WIDGET_VISIBLE(dbgw.dock) && all)
++	if(gtk_widget_get_visible(dbgw.dock) && all)
+         gtk_widget_hide(dbgw.dock);
+ 
+-    if(GTK_WIDGET_VISIBLE(dbgw.pclog))
++    if(gtk_widget_get_visible(dbgw.pclog))
+         gtk_widget_hide(dbgw.pclog);
+-	if(GTK_WIDGET_VISIBLE(dbgw.iop))
++	if(gtk_widget_get_visible(dbgw.iop))
+         gtk_widget_hide(dbgw.iop);
+-}
+\ No newline at end of file
++}
+diff -x .svn -ru tiemu-3.02-orig/src/gui/debugger/dbg_heap.c tiemu-3.02/src/gui/debugger/dbg_heap.c
+--- tiemu-3.02-orig/src/gui/debugger/dbg_heap.c	2010-08-19 12:25:41.000000000 +0200
++++ tiemu-3.02/src/gui/debugger/dbg_heap.c	2010-08-19 12:31:13.000000000 +0200
+@@ -171,7 +171,7 @@
+ 		gtk_window_iconify(GTK_WINDOW(dbgw.heap));
+ #endif
+ 
+-	if(!GTK_WIDGET_VISIBLE(dbgw.heap) && !options3.heap.closed)
++	if(!gtk_widget_get_visible(dbgw.heap) && !options3.heap.closed)
+ 		gtk_widget_show(dbgw.heap);
+ 
+ 	return dbgw.heap;
+@@ -276,4 +276,4 @@
+                                         gpointer         user_data)
+ {
+ 	dbgmem_add_tab(value);
+-}
+\ No newline at end of file
++}
+diff -x .svn -ru tiemu-3.02-orig/src/gui/debugger/dbg_iop.c tiemu-3.02/src/gui/debugger/dbg_iop.c
+--- tiemu-3.02-orig/src/gui/debugger/dbg_iop.c	2010-08-19 12:25:41.000000000 +0200
++++ tiemu-3.02/src/gui/debugger/dbg_iop.c	2010-08-19 12:31:13.000000000 +0200
+@@ -455,7 +455,7 @@
+ 		gtk_window_iconify(GTK_WINDOW(dbgw.iop));
+ #endif
+     
+-	if(!GTK_WIDGET_VISIBLE(dbgw.iop) && !options3.iop.closed)
++	if(!gtk_widget_get_visible(dbgw.iop) && !options3.iop.closed)
+ 		gtk_widget_show(dbgw.iop);
+ 
+ 	return dbgw.iop;
+diff -x .svn -ru tiemu-3.02-orig/src/gui/debugger/dbg_mem.c tiemu-3.02/src/gui/debugger/dbg_mem.c
+--- tiemu-3.02-orig/src/gui/debugger/dbg_mem.c	2010-08-19 12:25:41.000000000 +0200
++++ tiemu-3.02/src/gui/debugger/dbg_mem.c	2010-08-19 12:31:13.000000000 +0200
+@@ -435,7 +435,7 @@
+ 		gtk_window_iconify(GTK_WINDOW(dbgw.mem));
+ #endif
+ 
+-	if(!GTK_WIDGET_VISIBLE(dbgw.mem) && !options3.mem.closed)
++	if(!gtk_widget_get_visible(dbgw.mem) && !options3.mem.closed)
+ 		gtk_widget_show(dbgw.mem);
+ 
+     return dbgw.mem;
+diff -x .svn -ru tiemu-3.02-orig/src/gui/debugger/dbg_pclog.c tiemu-3.02/src/gui/debugger/dbg_pclog.c
+--- tiemu-3.02-orig/src/gui/debugger/dbg_pclog.c	2010-08-19 12:25:41.000000000 +0200
++++ tiemu-3.02/src/gui/debugger/dbg_pclog.c	2010-08-19 12:31:13.000000000 +0200
+@@ -163,7 +163,7 @@
+ 		gtk_window_iconify(GTK_WINDOW(dbgw.pclog));
+ #endif
+ 
+-	if(!GTK_WIDGET_VISIBLE(dbgw.pclog) && !options3.pclog.closed)
++	if(!gtk_widget_get_visible(dbgw.pclog) && !options3.pclog.closed)
+ 		gtk_widget_show(dbgw.pclog);
+ 
+ 	return dbgw.pclog;
+diff -x .svn -ru tiemu-3.02-orig/src/gui/debugger/dbg_regs.c tiemu-3.02/src/gui/debugger/dbg_regs.c
+--- tiemu-3.02-orig/src/gui/debugger/dbg_regs.c	2010-08-19 12:25:41.000000000 +0200
++++ tiemu-3.02/src/gui/debugger/dbg_regs.c	2010-08-19 12:31:13.000000000 +0200
+@@ -302,7 +302,7 @@
+ 		gtk_window_iconify(GTK_WINDOW(dbgw.regs));
+ #endif
+ 
+-	if(!GTK_WIDGET_VISIBLE(dbgw.regs) && !options3.regs.closed)
++	if(!gtk_widget_get_visible(dbgw.regs) && !options3.regs.closed)
+ 		gtk_widget_show(dbgw.regs);
+ 
+ 	return dbgw.regs;
+diff -x .svn -ru tiemu-3.02-orig/src/gui/debugger/dbg_stack.c tiemu-3.02/src/gui/debugger/dbg_stack.c
+--- tiemu-3.02-orig/src/gui/debugger/dbg_stack.c	2010-08-19 12:25:41.000000000 +0200
++++ tiemu-3.02/src/gui/debugger/dbg_stack.c	2010-08-19 12:31:13.000000000 +0200
+@@ -197,7 +197,7 @@
+ 		gtk_window_iconify(GTK_WINDOW(dbgw.stack));
+ #endif
+ 
+-	if(!GTK_WIDGET_VISIBLE(dbgw.stack) && !options3.stack.closed)
++	if(!gtk_widget_get_visible(dbgw.stack) && !options3.stack.closed)
+ 		gtk_widget_show(dbgw.stack);
+ 
+ 	return dbgw.stack;
+@@ -422,4 +422,4 @@
+                                         gpointer         user_data)
+ {
+ 	dbgmem_add_tab(value);
+-}
+\ No newline at end of file
++}
+diff -x .svn -ru tiemu-3.02-orig/src/gui/debugger/dbg_wnds.c tiemu-3.02/src/gui/debugger/dbg_wnds.c
+--- tiemu-3.02-orig/src/gui/debugger/dbg_wnds.c	2010-08-19 12:25:41.000000000 +0200
++++ tiemu-3.02/src/gui/debugger/dbg_wnds.c	2010-08-19 12:31:13.000000000 +0200
+@@ -74,21 +74,21 @@
+ 	if(options3.dbg_dock)
+ 		return;
+ 
+-    if(GTK_WIDGET_VISIBLE(dbgw.regs))
++    if(gtk_widget_get_visible(dbgw.regs))
+         gtk_window_iconify(GTK_WINDOW(dbgw.regs));
+-    if(GTK_WIDGET_VISIBLE(dbgw.bkpts))
++    if(gtk_widget_get_visible(dbgw.bkpts))
+         gtk_window_iconify(GTK_WINDOW(dbgw.bkpts));
+-    if(GTK_WIDGET_VISIBLE(dbgw.mem))
++    if(gtk_widget_get_visible(dbgw.mem))
+         gtk_window_iconify(GTK_WINDOW(dbgw.mem));
+-    if(GTK_WIDGET_VISIBLE(dbgw.pclog))
++    if(gtk_widget_get_visible(dbgw.pclog))
+         gtk_window_iconify(GTK_WINDOW(dbgw.pclog));
+-    if(GTK_WIDGET_VISIBLE(dbgw.code) & all)
++    if(gtk_widget_get_visible(dbgw.code) & all)
+         gtk_window_iconify(GTK_WINDOW(dbgw.code));
+-    if(GTK_WIDGET_VISIBLE(dbgw.stack))
++    if(gtk_widget_get_visible(dbgw.stack))
+         gtk_window_iconify(GTK_WINDOW(dbgw.stack));
+-	if(GTK_WIDGET_VISIBLE(dbgw.heap))
++	if(gtk_widget_get_visible(dbgw.heap))
+         gtk_window_iconify(GTK_WINDOW(dbgw.heap));
+-	if(GTK_WIDGET_VISIBLE(dbgw.iop))
++	if(gtk_widget_get_visible(dbgw.iop))
+         gtk_window_iconify(GTK_WINDOW(dbgw.iop));
+ }
+ 
+@@ -98,21 +98,21 @@
+ 	if(options3.dbg_dock)
+ 		return;
+ 
+-    if(GTK_WIDGET_VISIBLE(dbgw.regs))
++    if(gtk_widget_get_visible(dbgw.regs))
+         gtk_window_deiconify(GTK_WINDOW(dbgw.regs));
+-    if(GTK_WIDGET_VISIBLE(dbgw.bkpts))
++    if(gtk_widget_get_visible(dbgw.bkpts))
+         gtk_window_deiconify(GTK_WINDOW(dbgw.bkpts));
+-    if(GTK_WIDGET_VISIBLE(dbgw.mem))
++    if(gtk_widget_get_visible(dbgw.mem))
+         gtk_window_deiconify(GTK_WINDOW(dbgw.mem));
+-    if(GTK_WIDGET_VISIBLE(dbgw.pclog))
++    if(gtk_widget_get_visible(dbgw.pclog))
+         gtk_window_deiconify(GTK_WINDOW(dbgw.pclog));
+-    if(GTK_WIDGET_VISIBLE(dbgw.code) & all)
++    if(gtk_widget_get_visible(dbgw.code) & all)
+         gtk_window_deiconify(GTK_WINDOW(dbgw.code));
+-    if(GTK_WIDGET_VISIBLE(dbgw.stack))
++    if(gtk_widget_get_visible(dbgw.stack))
+         gtk_window_deiconify(GTK_WINDOW(dbgw.stack));
+-	if(GTK_WIDGET_VISIBLE(dbgw.heap))
++	if(gtk_widget_get_visible(dbgw.heap))
+         gtk_window_deiconify(GTK_WINDOW(dbgw.heap));
+-	if(GTK_WIDGET_VISIBLE(dbgw.iop))
++	if(gtk_widget_get_visible(dbgw.iop))
+         gtk_window_deiconify(GTK_WINDOW(dbgw.iop));
+ }
+ 
+@@ -122,21 +122,21 @@
+     if(options3.dbg_dock)
+ 		return;
+ 
+-    if(!GTK_WIDGET_VISIBLE(dbgw.regs))
++    if(!gtk_widget_get_visible(dbgw.regs))
+         gtk_widget_show(dbgw.regs);
+-    if(!GTK_WIDGET_VISIBLE(dbgw.bkpts))
++    if(!gtk_widget_get_visible(dbgw.bkpts))
+         gtk_widget_show(dbgw.bkpts);
+-    if(!GTK_WIDGET_VISIBLE(dbgw.mem))
++    if(!gtk_widget_get_visible(dbgw.mem))
+         gtk_widget_show(dbgw.mem);
+-    if(!GTK_WIDGET_VISIBLE(dbgw.pclog))
++    if(!gtk_widget_get_visible(dbgw.pclog))
+         gtk_widget_show(dbgw.pclog);
+-    if(!GTK_WIDGET_VISIBLE(dbgw.code) && all)
++    if(!gtk_widget_get_visible(dbgw.code) && all)
+         gtk_widget_show(dbgw.code);
+-    if(!GTK_WIDGET_VISIBLE(dbgw.stack))
++    if(!gtk_widget_get_visible(dbgw.stack))
+         gtk_widget_show(dbgw.stack);
+-	if(!GTK_WIDGET_VISIBLE(dbgw.heap))
++	if(!gtk_widget_get_visible(dbgw.heap))
+         gtk_widget_show(dbgw.heap);
+-	if(!GTK_WIDGET_VISIBLE(dbgw.iop))
++	if(!gtk_widget_get_visible(dbgw.iop))
+         gtk_widget_show(dbgw.iop);
+ }
+ 
+@@ -146,21 +146,21 @@
+     if(options3.dbg_dock)
+ 		return;
+ 
+-    if(GTK_WIDGET_VISIBLE(dbgw.regs))
++    if(gtk_widget_get_visible(dbgw.regs))
+         gtk_widget_hide(dbgw.regs);
+-    if(GTK_WIDGET_VISIBLE(dbgw.bkpts))
++    if(gtk_widget_get_visible(dbgw.bkpts))
+         gtk_widget_hide(dbgw.bkpts);
+-    if(GTK_WIDGET_VISIBLE(dbgw.mem))
++    if(gtk_widget_get_visible(dbgw.mem))
+         gtk_widget_hide(dbgw.mem);
+-    if(GTK_WIDGET_VISIBLE(dbgw.pclog))
++    if(gtk_widget_get_visible(dbgw.pclog))
+         gtk_widget_hide(dbgw.pclog);
+-    if(GTK_WIDGET_VISIBLE(dbgw.code) && all)
++    if(gtk_widget_get_visible(dbgw.code) && all)
+         gtk_widget_hide(dbgw.code);
+-    if(GTK_WIDGET_VISIBLE(dbgw.stack))
++    if(gtk_widget_get_visible(dbgw.stack))
+         gtk_widget_hide(dbgw.stack);
+-	if(GTK_WIDGET_VISIBLE(dbgw.heap))
++	if(gtk_widget_get_visible(dbgw.heap))
+         gtk_widget_hide(dbgw.heap);
+-	if(GTK_WIDGET_VISIBLE(dbgw.iop))
++	if(gtk_widget_get_visible(dbgw.iop))
+         gtk_widget_hide(dbgw.iop);
+ }
+ 
+@@ -334,7 +334,7 @@
+ 	if(!options3.dbg_dock)
+ 	{
+ 		g_signal_handlers_block_by_func(GTK_OBJECT(item), on_registers1_activate, NULL);
+-		gtk_check_menu_item_set_active(item, GTK_WIDGET_VISIBLE(dbgw.regs));
++		gtk_check_menu_item_set_active(item, gtk_widget_get_visible(dbgw.regs));
+ 		g_signal_handlers_unblock_by_func(GTK_OBJECT(item), on_registers1_activate, NULL);
+ 	}
+ 	else
+@@ -346,7 +346,7 @@
+ 	if(!options3.dbg_dock)
+ 	{
+ 		g_signal_handlers_block_by_func(GTK_OBJECT(item), on_breakpoints1_activate, NULL);
+-		gtk_check_menu_item_set_active(item, GTK_WIDGET_VISIBLE(dbgw.bkpts));
++		gtk_check_menu_item_set_active(item, gtk_widget_get_visible(dbgw.bkpts));
+ 		g_signal_handlers_unblock_by_func(GTK_OBJECT(item), on_breakpoints1_activate, NULL);
+ 	}
+ 	else
+@@ -358,7 +358,7 @@
+ 	if(!options3.dbg_dock)
+ 	{
+ 		g_signal_handlers_block_by_func(GTK_OBJECT(item), on_memory1_activate, NULL);
+-		gtk_check_menu_item_set_active(item, GTK_WIDGET_VISIBLE(dbgw.mem));
++		gtk_check_menu_item_set_active(item, gtk_widget_get_visible(dbgw.mem));
+ 		g_signal_handlers_unblock_by_func(GTK_OBJECT(item), on_memory1_activate, NULL);
+ 	}
+ 	else
+@@ -368,7 +368,7 @@
+     elt = g_list_nth(list, 3);
+     item = GTK_CHECK_MENU_ITEM(elt->data);
+     g_signal_handlers_block_by_func(GTK_OBJECT(item), on_pc_log1_activate, NULL);
+-    gtk_check_menu_item_set_active(item, GTK_WIDGET_VISIBLE(dbgw.pclog));
++    gtk_check_menu_item_set_active(item, gtk_widget_get_visible(dbgw.pclog));
+     g_signal_handlers_unblock_by_func(GTK_OBJECT(item), on_pc_log1_activate, NULL);
+ 
+     // stack
+@@ -377,7 +377,7 @@
+ 	if(!options3.dbg_dock)
+ 	{
+ 		g_signal_handlers_block_by_func(GTK_OBJECT(item), on_stack_frame1_activate, NULL);
+-		gtk_check_menu_item_set_active(item, GTK_WIDGET_VISIBLE(dbgw.stack));
++		gtk_check_menu_item_set_active(item, gtk_widget_get_visible(dbgw.stack));
+ 		g_signal_handlers_unblock_by_func(GTK_OBJECT(item), on_stack_frame1_activate, NULL);
+ 	}
+ 	else
+@@ -389,7 +389,7 @@
+ 	if(!options3.dbg_dock)
+ 	{
+ 		g_signal_handlers_block_by_func(GTK_OBJECT(item), on_heap_frame1_activate, NULL);
+-		gtk_check_menu_item_set_active(item, GTK_WIDGET_VISIBLE(dbgw.heap));
++		gtk_check_menu_item_set_active(item, gtk_widget_get_visible(dbgw.heap));
+ 		g_signal_handlers_unblock_by_func(GTK_OBJECT(item), on_heap_frame1_activate, NULL);
+ 	}
+ 	else
+@@ -399,7 +399,7 @@
+ 	elt = g_list_nth(list, 6);
+     item = GTK_CHECK_MENU_ITEM(elt->data);
+     g_signal_handlers_block_by_func(GTK_OBJECT(item), on_ioports_frame1_activate, NULL);
+-    gtk_check_menu_item_set_active(item, GTK_WIDGET_VISIBLE(dbgw.iop));
++    gtk_check_menu_item_set_active(item, gtk_widget_get_visible(dbgw.iop));
+     g_signal_handlers_unblock_by_func(GTK_OBJECT(item), on_ioports_frame1_activate, NULL);
+ 
+ 	// dock/multi mode
+@@ -714,4 +714,4 @@
+ {
+ 	printf("Duration (%s): %i ms\n", str, TO_CURRENT(profile));
+ }
+-*/
+\ No newline at end of file
++*/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100819/f424de3e/attachment-0001.html>


More information about the macports-changes mailing list