diff -u tiemu-3.02/debian/changelog tiemu-3.02/debian/changelog --- tiemu-3.02/debian/changelog +++ tiemu-3.02/debian/changelog @@ -1,3 +1,12 @@ +tiemu (3.02-1ubuntu1) lucid; urgency=low + + * Merge from debian testing (LP: #221332), remaining changes: + - Depend on firefox + - Fixed calls to old/removed GTK to fix a FTBFS: + debian/patches/04_remove_depricated_gtk_calls.dpatch + + -- Scott Howard Mon, 15 Mar 2010 22:24:53 -0400 + tiemu (3.02-1) unstable; urgency=low * New upstream release. @@ -7,6 +16,22 @@ -- Krzysztof Burghardt Sun, 27 Sep 2009 12:15:27 +0200 +tiemu (2.00-4ubuntu2) intrepid; urgency=low + + * fix LP: #272772: packages that Depend/Recommend/Suggest firefox + (meta-package) must alternatively Depend/Recommend/Suggest abrowser + - update debian/control + + -- Fabien Tassin Sun, 21 Sep 2008 23:57:35 +0200 + +tiemu (2.00-4ubuntu1) hardy; urgency=low + + * Merge from debian unstable (LP: #192608), remaining changes: + - Depend on firefox | www-browser + - debian/control: Change Maintainer/XSBC-Original-Maintainer field. + + -- Stefan Ebner Sun, 17 Feb 2008 12:47:30 +0100 + tiemu (2.00-4) unstable; urgency=low * QA upload @@ -19,6 +44,24 @@ -- Ralf Treinen Wed, 16 Jan 2008 21:35:36 +0100 +tiemu (2.00-3ubuntu2) gutsy; urgency=low + + * src/gui/filesel.c, src/gui/calc/popup.c: undefine GTK_DISABLE_DEPRECATED + before including gtk/gtk.h. + + -- Michael Bienia Sun, 02 Sep 2007 16:01:24 +0200 + +tiemu (2.00-3ubuntu1) feisty; urgency=low + + [ Luca Falavigna ] + * Merge from debian unstable, remaining changes: + - Depend on firefox | www-browser + + [ Michael Bienia ] + * debian/control: Change Maintainer/XSBC-Original-Maintainer field. + + -- Michael Bienia Tue, 27 Feb 2007 21:49:49 +0100 + tiemu (2.00-3) unstable; urgency=low * QA upload. @@ -28,6 +71,12 @@ -- Michael Ablassmeier Mon, 22 Jan 2007 10:32:07 +0100 +tiemu (2.00-2ubuntu1) feisty; urgency=low + + * Depend on firefox | www-browser. + + -- Michael Bienia Wed, 14 Feb 2007 14:35:43 +0100 + tiemu (2.00-2) unstable; urgency=low * Orphaning this package. @@ -223 +271,0 @@ - diff -u tiemu-3.02/debian/control tiemu-3.02/debian/control --- tiemu-3.02/debian/control +++ tiemu-3.02/debian/control @@ -1,14 +1,15 @@ Source: tiemu Section: math Priority: optional -Maintainer: Krzysztof Burghardt +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Krzysztof Burghardt Build-Depends: debhelper (>= 5), libticables-dev (>= 1.2.0), libticalcs-dev (>= 1.1.0), libtifiles-dev (>= 1.1.0), libticonv-dev (>= 1.1.0), libgtk2.0-dev, libglade2-dev, zlib1g-dev, gettext, groff-base, libdbus-glib-1-dev, libsdl1.2-dev (>= 1.2.0), libncurses5-dev, bison, texinfo, flex, autotools-dev, dpatch Standards-Version: 3.8.3 Homepage: http://lpg.ticalc.org/prj_tiemu/ Package: tiemu Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iceweasel | www-browser +Depends: ${shlibs:Depends}, ${misc:Depends}, firefox | abrowser | www-browser Replaces: gtktiemu Conflicts: gtktiemu, tiemu-gdb Suggests: tiemu-skinedit diff -u tiemu-3.02/debian/patches/00list tiemu-3.02/debian/patches/00list --- tiemu-3.02/debian/patches/00list +++ tiemu-3.02/debian/patches/00list @@ -3,0 +4 @@ +04_remove_depricated_gtk_calls only in patch2: unchanged: --- tiemu-3.02.orig/debian/patches/04_remove_depricated_gtk_calls.dpatch +++ tiemu-3.02/debian/patches/04_remove_depricated_gtk_calls.dpatch @@ -0,0 +1,424 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_remove_depricated_gtk_calls.dpatch by Scott Howard +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixes a FTBFS when using GTK at least >= 2.19 + +@DPATCH@ +diff -urNad tiemu-3.02-1ubuntu1~/src/gui/calc/calc.c tiemu-3.02-1ubuntu1/src/gui/calc/calc.c +--- tiemu-3.02-1ubuntu1~/src/gui/calc/calc.c 2009-11-05 23:42:39.000000000 -0500 ++++ tiemu-3.02-1ubuntu1/src/gui/calc/calc.c 2010-03-15 09:04:15.831442105 -0400 +@@ -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 -urNad tiemu-3.02-1ubuntu1~/src/gui/calc/screen.c tiemu-3.02-1ubuntu1/src/gui/calc/screen.c +--- tiemu-3.02-1ubuntu1~/src/gui/calc/screen.c 2009-11-05 23:42:39.000000000 -0500 ++++ tiemu-3.02-1ubuntu1/src/gui/calc/screen.c 2010-03-15 09:04:15.831442105 -0400 +@@ -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 -urNad tiemu-3.02-1ubuntu1~/src/gui/debugger/dbg_all.c tiemu-3.02-1ubuntu1/src/gui/debugger/dbg_all.c +--- tiemu-3.02-1ubuntu1~/src/gui/debugger/dbg_all.c 2010-03-15 09:04:15.401438375 -0400 ++++ tiemu-3.02-1ubuntu1/src/gui/debugger/dbg_all.c 2010-03-15 09:06:41.601442536 -0400 +@@ -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(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.bkpts)) ++ if(options3.dbg_dock || gtk_widget_get_visible(dbgw.bkpts)) + dbgbkpts_refresh_window(); + + delete_command(NULL, 0); +diff -urNad tiemu-3.02-1ubuntu1~/src/gui/debugger/dbg_bkpts.c tiemu-3.02-1ubuntu1/src/gui/debugger/dbg_bkpts.c +--- tiemu-3.02-1ubuntu1~/src/gui/debugger/dbg_bkpts.c 2009-11-05 23:42:39.000000000 -0500 ++++ tiemu-3.02-1ubuntu1/src/gui/debugger/dbg_bkpts.c 2010-03-15 09:06:41.621436380 -0400 +@@ -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 -urNad tiemu-3.02-1ubuntu1~/src/gui/debugger/dbg_code.c tiemu-3.02-1ubuntu1/src/gui/debugger/dbg_code.c +--- tiemu-3.02-1ubuntu1~/src/gui/debugger/dbg_code.c 2009-11-05 23:42:40.000000000 -0500 ++++ tiemu-3.02-1ubuntu1/src/gui/debugger/dbg_code.c 2010-03-15 09:06:41.651435945 -0400 +@@ -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 -urNad tiemu-3.02-1ubuntu1~/src/gui/debugger/dbg_dock.c tiemu-3.02-1ubuntu1/src/gui/debugger/dbg_dock.c +--- tiemu-3.02-1ubuntu1~/src/gui/debugger/dbg_dock.c 2007-12-14 16:03:43.000000000 -0500 ++++ tiemu-3.02-1ubuntu1/src/gui/debugger/dbg_dock.c 2010-03-15 09:06:41.651435945 -0400 +@@ -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 -urNad tiemu-3.02-1ubuntu1~/src/gui/debugger/dbg_heap.c tiemu-3.02-1ubuntu1/src/gui/debugger/dbg_heap.c +--- tiemu-3.02-1ubuntu1~/src/gui/debugger/dbg_heap.c 2009-11-05 23:42:40.000000000 -0500 ++++ tiemu-3.02-1ubuntu1/src/gui/debugger/dbg_heap.c 2010-03-15 09:06:41.661437197 -0400 +@@ -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; +diff -urNad tiemu-3.02-1ubuntu1~/src/gui/debugger/dbg_iop.c tiemu-3.02-1ubuntu1/src/gui/debugger/dbg_iop.c +--- tiemu-3.02-1ubuntu1~/src/gui/debugger/dbg_iop.c 2009-11-05 23:42:40.000000000 -0500 ++++ tiemu-3.02-1ubuntu1/src/gui/debugger/dbg_iop.c 2010-03-15 09:06:41.661437197 -0400 +@@ -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 -urNad tiemu-3.02-1ubuntu1~/src/gui/debugger/dbg_mem.c tiemu-3.02-1ubuntu1/src/gui/debugger/dbg_mem.c +--- tiemu-3.02-1ubuntu1~/src/gui/debugger/dbg_mem.c 2009-11-05 23:42:40.000000000 -0500 ++++ tiemu-3.02-1ubuntu1/src/gui/debugger/dbg_mem.c 2010-03-15 09:06:41.681436069 -0400 +@@ -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 -urNad tiemu-3.02-1ubuntu1~/src/gui/debugger/dbg_pclog.c tiemu-3.02-1ubuntu1/src/gui/debugger/dbg_pclog.c +--- tiemu-3.02-1ubuntu1~/src/gui/debugger/dbg_pclog.c 2009-11-05 23:42:40.000000000 -0500 ++++ tiemu-3.02-1ubuntu1/src/gui/debugger/dbg_pclog.c 2010-03-15 09:06:41.681436069 -0400 +@@ -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 -urNad tiemu-3.02-1ubuntu1~/src/gui/debugger/dbg_regs.c tiemu-3.02-1ubuntu1/src/gui/debugger/dbg_regs.c +--- tiemu-3.02-1ubuntu1~/src/gui/debugger/dbg_regs.c 2009-11-05 23:42:40.000000000 -0500 ++++ tiemu-3.02-1ubuntu1/src/gui/debugger/dbg_regs.c 2010-03-15 09:06:41.681436069 -0400 +@@ -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 -urNad tiemu-3.02-1ubuntu1~/src/gui/debugger/dbg_stack.c tiemu-3.02-1ubuntu1/src/gui/debugger/dbg_stack.c +--- tiemu-3.02-1ubuntu1~/src/gui/debugger/dbg_stack.c 2009-11-05 23:42:39.000000000 -0500 ++++ tiemu-3.02-1ubuntu1/src/gui/debugger/dbg_stack.c 2010-03-15 09:06:41.691435645 -0400 +@@ -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; +diff -urNad tiemu-3.02-1ubuntu1~/src/gui/debugger/dbg_wnds.c tiemu-3.02-1ubuntu1/src/gui/debugger/dbg_wnds.c +--- tiemu-3.02-1ubuntu1~/src/gui/debugger/dbg_wnds.c 2010-03-15 09:04:15.401438375 -0400 ++++ tiemu-3.02-1ubuntu1/src/gui/debugger/dbg_wnds.c 2010-03-15 09:06:41.691435645 -0400 +@@ -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); + } + +@@ -338,7 +338,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 +@@ -350,7 +350,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 +@@ -362,7 +362,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 +@@ -372,7 +372,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 +@@ -381,7 +381,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 +@@ -393,7 +393,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 +@@ -403,7 +403,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