01-build-fix.patch 20 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488
  1. # This patch is based on the Ubuntu patch for TiEmu 3.02, see
  2. # http://packages.ubuntu.com/de/oneiric/tiemu
  3. diff -purN tiemu-3.03.orig/src/gui/calc/calc.c tiemu-3.03/src/gui/calc/calc.c
  4. --- tiemu-3.03.orig/src/gui/calc/calc.c 2007-12-16 16:29:16.000000000 +0100
  5. +++ tiemu-3.03/src/gui/calc/calc.c 2011-11-04 23:11:40.000000000 +0100
  6. @@ -313,7 +313,7 @@ on_drawingarea1_expose_event (
  7. {
  8. gdk_draw_pixmap(
  9. widget->window,
  10. - widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
  11. + widget->style->fg_gc[gtk_widget_get_state (widget)],
  12. pixmap,
  13. event->area.x, event->area.y,
  14. event->area.x, event->area.y,
  15. @@ -586,7 +586,7 @@ int hid_init(void)
  16. // Install LCD refresh: 100 FPS (10 ms)
  17. tid = g_timeout_add((params.lcd_rate == -1) ? 50 : params.lcd_rate,
  18. - (GtkFunction)hid_refresh, NULL);
  19. + (GSourceFunc)hid_refresh, NULL);
  20. explicit_destroy = 0;
  21. gtk_widget_show(main_wnd); // show wnd here
  22. @@ -640,7 +640,7 @@ void hid_lcd_rate_set(void)
  23. g_source_remove(tid);
  24. tid = g_timeout_add((params.lcd_rate == -1) ? 50 : params.lcd_rate,
  25. - (GtkFunction)hid_refresh, NULL);
  26. + (GSourceFunc)hid_refresh, NULL);
  27. }
  28. int hid_switch_with_skin(void)
  29. diff -purN tiemu-3.03.orig/src/gui/calc/popup.c tiemu-3.03/src/gui/calc/popup.c
  30. --- tiemu-3.03.orig/src/gui/calc/popup.c 2009-05-08 22:43:47.000000000 +0200
  31. +++ tiemu-3.03/src/gui/calc/popup.c 2011-11-04 22:45:28.000000000 +0100
  32. @@ -26,7 +26,9 @@
  33. # include <config.h>
  34. #endif
  35. +#undef GTK_DISABLE_DEPRECATED
  36. #include <gtk/gtk.h>
  37. +#define GTK_DISABLE_DEPRECATED
  38. #include <glade/glade.h>
  39. #include <stdlib.h>
  40. #include <string.h>
  41. diff -purN tiemu-3.03.orig/src/gui/calc/screen.c tiemu-3.03/src/gui/calc/screen.c
  42. --- tiemu-3.03.orig/src/gui/calc/screen.c 2006-11-06 18:18:51.000000000 +0100
  43. +++ tiemu-3.03/src/gui/calc/screen.c 2011-11-04 23:12:09.000000000 +0100
  44. @@ -187,7 +187,7 @@ void redraw_skin(void)
  45. skin_infos.image = gdk_pixbuf_scale_simple(skin_infos.raw, wr.wr.w, wr.wr.h, GDK_INTERP_NEAREST);
  46. // and draw image into pixmap (next, into window on expose event)
  47. - gdk_draw_pixbuf(pixmap, main_wnd->style->fg_gc[GTK_WIDGET_STATE(main_wnd)],
  48. + gdk_draw_pixbuf(pixmap, main_wnd->style->fg_gc[gtk_widget_get_state(main_wnd)],
  49. skin_infos.image, 0, 0, 0, 0, -1, -1, GDK_RGB_DITHER_NONE, 0, 0);
  50. gdk_window_invalidate_rect(main_wnd->window, &wr.gr, FALSE);
  51. }
  52. @@ -204,7 +204,7 @@ void redraw_lcd(void)
  53. gdk_pixbuf_scale_simple(skin_infos.raw, sr.w, sr.h, GDK_INTERP_NEAREST);
  54. // and draw
  55. - gdk_draw_pixbuf(pixmap, main_wnd->style->fg_gc[GTK_WIDGET_STATE(main_wnd)],
  56. + gdk_draw_pixbuf(pixmap, main_wnd->style->fg_gc[gtk_widget_get_state(main_wnd)],
  57. skin_infos.image, ls.x, ls.y, lr.x, lr.y, lr.w, lr.h, GDK_RGB_DITHER_NONE, 0, 0);
  58. gtk_widget_queue_draw_area(area, lr.x, lr.y, lr.w, lr.h);
  59. }
  60. @@ -324,7 +324,7 @@ int hid_update_lcd(void)
  61. skin_infos.image = gdk_pixbuf_scale_simple(lcd, lr.w, lr.h, GDK_INTERP_NEAREST);
  62. // and draw image into pixmap (next, into window on expose event)
  63. - gdk_draw_pixbuf(pixmap, main_wnd->style->fg_gc[GTK_WIDGET_STATE(main_wnd)],
  64. + gdk_draw_pixbuf(pixmap, main_wnd->style->fg_gc[gtk_widget_get_state(main_wnd)],
  65. skin_infos.image, src.x, src.y, lr.x, lr.y, src.w, src.h,
  66. GDK_RGB_DITHER_NONE, 0, 0);
  67. gtk_widget_queue_draw_area(area, lr.x, lr.y, src.w, src.h);
  68. @@ -332,7 +332,7 @@ int hid_update_lcd(void)
  69. else
  70. {
  71. // and draw image into pixmap (next, into window on expose event)
  72. - gdk_draw_pixbuf(pixmap, main_wnd->style->fg_gc[GTK_WIDGET_STATE(main_wnd)],
  73. + gdk_draw_pixbuf(pixmap, main_wnd->style->fg_gc[gtk_widget_get_state(main_wnd)],
  74. lcd_mem, src.x, src.y, lr.x, lr.y, src.w, src.h,
  75. GDK_RGB_DITHER_NONE, 0, 0);
  76. gtk_widget_queue_draw_area(area, lr.x, lr.y, src.w, src.h);
  77. diff -purN tiemu-3.03.orig/src/gui/debugger/dbg_all.c tiemu-3.03/src/gui/debugger/dbg_all.c
  78. --- tiemu-3.03.orig/src/gui/debugger/dbg_all.c 2009-05-08 12:56:40.000000000 +0200
  79. +++ tiemu-3.03/src/gui/debugger/dbg_all.c 2011-11-04 22:46:29.000000000 +0100
  80. @@ -90,21 +90,21 @@ void gtk_debugger_refresh(void)
  81. {
  82. WND_TMR_START();
  83. - if(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.regs))
  84. + if(options3.dbg_dock || gtk_widget_get_visible(dbgw.regs))
  85. dbgregs_refresh_window();
  86. - if(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.mem))
  87. + if(options3.dbg_dock || gtk_widget_get_visible(dbgw.mem))
  88. dbgmem_refresh_window();
  89. - if(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.bkpts))
  90. + if(options3.dbg_dock || gtk_widget_get_visible(dbgw.bkpts))
  91. dbgbkpts_refresh_window();
  92. - if(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.pclog))
  93. + if(options3.dbg_dock || gtk_widget_get_visible(dbgw.pclog))
  94. dbgpclog_refresh_window();
  95. - if(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.code))
  96. + if(options3.dbg_dock || gtk_widget_get_visible(dbgw.code))
  97. dbgcode_refresh_window();
  98. - if(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.stack))
  99. + if(options3.dbg_dock || gtk_widget_get_visible(dbgw.stack))
  100. dbgstack_refresh_window();
  101. - if(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.heap))
  102. + if(options3.dbg_dock || gtk_widget_get_visible(dbgw.heap))
  103. dbgheap_refresh_window();
  104. - if(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.iop))
  105. + if(options3.dbg_dock || gtk_widget_get_visible(dbgw.iop))
  106. dbgiop_refresh_window();
  107. WND_TMR_STOP("Debugger Refresh Time");
  108. @@ -163,7 +163,7 @@ int gtk_debugger_enter(int context)
  109. gtk_debugger_refresh();
  110. // enable the debugger if GDB disabled it
  111. - if (!options3.dbg_dock && !GTK_WIDGET_SENSITIVE(dbgw.regs))
  112. + if (!options3.dbg_dock && !gtk_widget_get_sensitive(dbgw.regs))
  113. gtk_debugger_enable();
  114. // handle automatic debugging requests
  115. @@ -180,7 +180,7 @@ int gtk_debugger_enter(int context)
  116. ti68k_bkpt_get_pgmentry_offset(id, &handle, &offset);
  117. ti68k_bkpt_del_pgmentry(handle);
  118. - if(options3.dbg_dock || GTK_WIDGET_VISIBLE(dbgw.bkpts))
  119. + if(options3.dbg_dock || gtk_widget_get_visible(dbgw.bkpts))
  120. dbgbkpts_refresh_window();
  121. delete_command(NULL, 0);
  122. diff -purN tiemu-3.03.orig/src/gui/debugger/dbg_bkpts.c tiemu-3.03/src/gui/debugger/dbg_bkpts.c
  123. --- tiemu-3.03.orig/src/gui/debugger/dbg_bkpts.c 2009-05-06 21:48:47.000000000 +0200
  124. +++ tiemu-3.03/src/gui/debugger/dbg_bkpts.c 2011-11-04 22:46:29.000000000 +0100
  125. @@ -388,7 +388,7 @@ GtkWidget* dbgbkpts_display_window(void)
  126. gtk_window_iconify(GTK_WINDOW(wnd));
  127. #endif
  128. - if(!GTK_WIDGET_VISIBLE(dbgw.bkpts) && !options3.bkpts.closed)
  129. + if(!gtk_widget_get_visible(dbgw.bkpts) && !options3.bkpts.closed)
  130. gtk_widget_show(wnd);
  131. return wnd;
  132. diff -purN tiemu-3.03.orig/src/gui/debugger/dbg_code.c tiemu-3.03/src/gui/debugger/dbg_code.c
  133. --- tiemu-3.03.orig/src/gui/debugger/dbg_code.c 2009-05-06 21:48:47.000000000 +0200
  134. +++ tiemu-3.03/src/gui/debugger/dbg_code.c 2011-11-04 22:46:29.000000000 +0100
  135. @@ -1117,7 +1117,7 @@ void gdbcallback_refresh_debugger(void)
  136. int dbgcode_quit_enabled(void)
  137. {
  138. - return GTK_WIDGET_SENSITIVE(mi.m8);
  139. + return gtk_widget_get_sensitive(mi.m8);
  140. }
  141. static int close_debugger_wrapper(gpointer data)
  142. diff -purN tiemu-3.03.orig/src/gui/debugger/dbg_dock.c tiemu-3.03/src/gui/debugger/dbg_dock.c
  143. --- tiemu-3.03.orig/src/gui/debugger/dbg_dock.c 2008-05-26 18:48:30.000000000 +0200
  144. +++ tiemu-3.03/src/gui/debugger/dbg_dock.c 2011-11-04 23:05:02.000000000 +0100
  145. @@ -151,22 +151,22 @@ void dbgdock_set_sensitivity(int state)
  146. void dbgdock_show_all(int all)
  147. {
  148. - if(!GTK_WIDGET_VISIBLE(dbgw.dock) && all)
  149. + if(!gtk_widget_get_visible(dbgw.dock) && all)
  150. gtk_widget_show(dbgw.dock);
  151. - if(GTK_WIDGET_VISIBLE(dbgw.iop))
  152. + if(gtk_widget_get_visible(dbgw.iop))
  153. gtk_window_iconify(GTK_WINDOW(dbgw.iop));
  154. - if(GTK_WIDGET_VISIBLE(dbgw.pclog))
  155. + if(gtk_widget_get_visible(dbgw.pclog))
  156. gtk_window_iconify(GTK_WINDOW(dbgw.pclog));
  157. }
  158. void dbgdock_hide_all(int all)
  159. {
  160. - if(GTK_WIDGET_VISIBLE(dbgw.dock) && all)
  161. + if(gtk_widget_get_visible(dbgw.dock) && all)
  162. gtk_widget_hide(dbgw.dock);
  163. - if(GTK_WIDGET_VISIBLE(dbgw.pclog))
  164. + if(gtk_widget_get_visible(dbgw.pclog))
  165. gtk_widget_hide(dbgw.pclog);
  166. - if(GTK_WIDGET_VISIBLE(dbgw.iop))
  167. + if(gtk_widget_get_visible(dbgw.iop))
  168. gtk_widget_hide(dbgw.iop);
  169. }
  170. diff -purN tiemu-3.03.orig/src/gui/debugger/dbg_heap.c tiemu-3.03/src/gui/debugger/dbg_heap.c
  171. --- tiemu-3.03.orig/src/gui/debugger/dbg_heap.c 2009-05-06 21:48:47.000000000 +0200
  172. +++ tiemu-3.03/src/gui/debugger/dbg_heap.c 2011-11-04 22:46:29.000000000 +0100
  173. @@ -171,7 +171,7 @@ GtkWidget* dbgheap_display_window(void)
  174. gtk_window_iconify(GTK_WINDOW(dbgw.heap));
  175. #endif
  176. - if(!GTK_WIDGET_VISIBLE(dbgw.heap) && !options3.heap.closed)
  177. + if(!gtk_widget_get_visible(dbgw.heap) && !options3.heap.closed)
  178. gtk_widget_show(dbgw.heap);
  179. return dbgw.heap;
  180. diff -purN tiemu-3.03.orig/src/gui/debugger/dbg_iop.c tiemu-3.03/src/gui/debugger/dbg_iop.c
  181. --- tiemu-3.03.orig/src/gui/debugger/dbg_iop.c 2009-05-02 21:46:04.000000000 +0200
  182. +++ tiemu-3.03/src/gui/debugger/dbg_iop.c 2011-11-04 22:46:29.000000000 +0100
  183. @@ -455,7 +455,7 @@ GtkWidget* dbgiop_display_window(void)
  184. gtk_window_iconify(GTK_WINDOW(dbgw.iop));
  185. #endif
  186. - if(!GTK_WIDGET_VISIBLE(dbgw.iop) && !options3.iop.closed)
  187. + if(!gtk_widget_get_visible(dbgw.iop) && !options3.iop.closed)
  188. gtk_widget_show(dbgw.iop);
  189. return dbgw.iop;
  190. diff -purN tiemu-3.03.orig/src/gui/debugger/dbg_mem.c tiemu-3.03/src/gui/debugger/dbg_mem.c
  191. --- tiemu-3.03.orig/src/gui/debugger/dbg_mem.c 2009-05-06 21:48:47.000000000 +0200
  192. +++ tiemu-3.03/src/gui/debugger/dbg_mem.c 2011-11-04 22:46:29.000000000 +0100
  193. @@ -435,7 +435,7 @@ GtkWidget* dbgmem_display_window(void)
  194. gtk_window_iconify(GTK_WINDOW(dbgw.mem));
  195. #endif
  196. - if(!GTK_WIDGET_VISIBLE(dbgw.mem) && !options3.mem.closed)
  197. + if(!gtk_widget_get_visible(dbgw.mem) && !options3.mem.closed)
  198. gtk_widget_show(dbgw.mem);
  199. return dbgw.mem;
  200. @@ -605,7 +605,7 @@ dbgmem_button6_clicked
  201. GLADE_CB void
  202. on_notebook1_switch_page (GtkNotebook *notebook,
  203. - GtkNotebookPage *page,
  204. + gpointer *page,
  205. guint page_num,
  206. gpointer user_data)
  207. {
  208. diff -purN tiemu-3.03.orig/src/gui/debugger/dbg_pclog.c tiemu-3.03/src/gui/debugger/dbg_pclog.c
  209. --- tiemu-3.03.orig/src/gui/debugger/dbg_pclog.c 2009-05-02 21:46:04.000000000 +0200
  210. +++ tiemu-3.03/src/gui/debugger/dbg_pclog.c 2011-11-04 22:46:29.000000000 +0100
  211. @@ -163,7 +163,7 @@ GtkWidget* dbgpclog_display_window(void)
  212. gtk_window_iconify(GTK_WINDOW(dbgw.pclog));
  213. #endif
  214. - if(!GTK_WIDGET_VISIBLE(dbgw.pclog) && !options3.pclog.closed)
  215. + if(!gtk_widget_get_visible(dbgw.pclog) && !options3.pclog.closed)
  216. gtk_widget_show(dbgw.pclog);
  217. return dbgw.pclog;
  218. diff -purN tiemu-3.03.orig/src/gui/debugger/dbg_regs.c tiemu-3.03/src/gui/debugger/dbg_regs.c
  219. --- tiemu-3.03.orig/src/gui/debugger/dbg_regs.c 2009-05-06 21:48:47.000000000 +0200
  220. +++ tiemu-3.03/src/gui/debugger/dbg_regs.c 2011-11-04 22:46:29.000000000 +0100
  221. @@ -302,7 +302,7 @@ GtkWidget* dbgregs_display_window(void)
  222. gtk_window_iconify(GTK_WINDOW(dbgw.regs));
  223. #endif
  224. - if(!GTK_WIDGET_VISIBLE(dbgw.regs) && !options3.regs.closed)
  225. + if(!gtk_widget_get_visible(dbgw.regs) && !options3.regs.closed)
  226. gtk_widget_show(dbgw.regs);
  227. return dbgw.regs;
  228. diff -purN tiemu-3.03.orig/src/gui/debugger/dbg_romcall.c tiemu-3.03/src/gui/debugger/dbg_romcall.c
  229. --- tiemu-3.03.orig/src/gui/debugger/dbg_romcall.c 2007-07-05 13:36:10.000000000 +0200
  230. +++ tiemu-3.03/src/gui/debugger/dbg_romcall.c 2011-11-04 22:46:29.000000000 +0100
  231. @@ -29,7 +29,9 @@
  232. # include <config.h>
  233. #endif
  234. -#include <gtk/gtk.h>
  235. +#undef GTK_DISABLE_DEPRECATED
  236. + #include <gtk/gtk.h>
  237. +#define GTK_DISABLE_DEPRECATED
  238. #include <glade/glade.h>
  239. #include <string.h>
  240. diff -purN tiemu-3.03.orig/src/gui/debugger/dbg_stack.c tiemu-3.03/src/gui/debugger/dbg_stack.c
  241. --- tiemu-3.03.orig/src/gui/debugger/dbg_stack.c 2009-05-06 21:48:47.000000000 +0200
  242. +++ tiemu-3.03/src/gui/debugger/dbg_stack.c 2011-11-04 22:46:29.000000000 +0100
  243. @@ -197,7 +197,7 @@ GtkWidget* dbgstack_display_window(void)
  244. gtk_window_iconify(GTK_WINDOW(dbgw.stack));
  245. #endif
  246. - if(!GTK_WIDGET_VISIBLE(dbgw.stack) && !options3.stack.closed)
  247. + if(!gtk_widget_get_visible(dbgw.stack) && !options3.stack.closed)
  248. gtk_widget_show(dbgw.stack);
  249. return dbgw.stack;
  250. diff -purN tiemu-3.03.orig/src/gui/debugger/dbg_wnds.c tiemu-3.03/src/gui/debugger/dbg_wnds.c
  251. --- tiemu-3.03.orig/src/gui/debugger/dbg_wnds.c 2009-05-07 09:18:02.000000000 +0200
  252. +++ tiemu-3.03/src/gui/debugger/dbg_wnds.c 2011-11-04 23:07:54.000000000 +0100
  253. @@ -74,21 +74,21 @@ void dbgwnds_minimize_all(int all)
  254. if(options3.dbg_dock)
  255. return;
  256. - if(GTK_WIDGET_VISIBLE(dbgw.regs))
  257. + if(gtk_widget_get_visible(dbgw.regs))
  258. gtk_window_iconify(GTK_WINDOW(dbgw.regs));
  259. - if(GTK_WIDGET_VISIBLE(dbgw.bkpts))
  260. + if(gtk_widget_get_visible(dbgw.bkpts))
  261. gtk_window_iconify(GTK_WINDOW(dbgw.bkpts));
  262. - if(GTK_WIDGET_VISIBLE(dbgw.mem))
  263. + if(gtk_widget_get_visible(dbgw.mem))
  264. gtk_window_iconify(GTK_WINDOW(dbgw.mem));
  265. - if(GTK_WIDGET_VISIBLE(dbgw.pclog))
  266. + if(gtk_widget_get_visible(dbgw.pclog))
  267. gtk_window_iconify(GTK_WINDOW(dbgw.pclog));
  268. - if(GTK_WIDGET_VISIBLE(dbgw.code) & all)
  269. + if(gtk_widget_get_visible(dbgw.code) & all)
  270. gtk_window_iconify(GTK_WINDOW(dbgw.code));
  271. - if(GTK_WIDGET_VISIBLE(dbgw.stack))
  272. + if(gtk_widget_get_visible(dbgw.stack))
  273. gtk_window_iconify(GTK_WINDOW(dbgw.stack));
  274. - if(GTK_WIDGET_VISIBLE(dbgw.heap))
  275. + if(gtk_widget_get_visible(dbgw.heap))
  276. gtk_window_iconify(GTK_WINDOW(dbgw.heap));
  277. - if(GTK_WIDGET_VISIBLE(dbgw.iop))
  278. + if(gtk_widget_get_visible(dbgw.iop))
  279. gtk_window_iconify(GTK_WINDOW(dbgw.iop));
  280. }
  281. @@ -98,21 +98,21 @@ void dbgwnds_unminimize_all(int all)
  282. if(options3.dbg_dock)
  283. return;
  284. - if(GTK_WIDGET_VISIBLE(dbgw.regs))
  285. + if(gtk_widget_get_visible(dbgw.regs))
  286. gtk_window_deiconify(GTK_WINDOW(dbgw.regs));
  287. - if(GTK_WIDGET_VISIBLE(dbgw.bkpts))
  288. + if(gtk_widget_get_visible(dbgw.bkpts))
  289. gtk_window_deiconify(GTK_WINDOW(dbgw.bkpts));
  290. - if(GTK_WIDGET_VISIBLE(dbgw.mem))
  291. + if(gtk_widget_get_visible(dbgw.mem))
  292. gtk_window_deiconify(GTK_WINDOW(dbgw.mem));
  293. - if(GTK_WIDGET_VISIBLE(dbgw.pclog))
  294. + if(gtk_widget_get_visible(dbgw.pclog))
  295. gtk_window_deiconify(GTK_WINDOW(dbgw.pclog));
  296. - if(GTK_WIDGET_VISIBLE(dbgw.code) & all)
  297. + if(gtk_widget_get_visible(dbgw.code) & all)
  298. gtk_window_deiconify(GTK_WINDOW(dbgw.code));
  299. - if(GTK_WIDGET_VISIBLE(dbgw.stack))
  300. + if(gtk_widget_get_visible(dbgw.stack))
  301. gtk_window_deiconify(GTK_WINDOW(dbgw.stack));
  302. - if(GTK_WIDGET_VISIBLE(dbgw.heap))
  303. + if(gtk_widget_get_visible(dbgw.heap))
  304. gtk_window_deiconify(GTK_WINDOW(dbgw.heap));
  305. - if(GTK_WIDGET_VISIBLE(dbgw.iop))
  306. + if(gtk_widget_get_visible(dbgw.iop))
  307. gtk_window_deiconify(GTK_WINDOW(dbgw.iop));
  308. }
  309. @@ -122,21 +122,21 @@ void dbgwnds_show_all(int all)
  310. if(options3.dbg_dock)
  311. return;
  312. - if(!GTK_WIDGET_VISIBLE(dbgw.regs))
  313. + if(!gtk_widget_get_visible(dbgw.regs))
  314. gtk_widget_show(dbgw.regs);
  315. - if(!GTK_WIDGET_VISIBLE(dbgw.bkpts))
  316. + if(!gtk_widget_get_visible(dbgw.bkpts))
  317. gtk_widget_show(dbgw.bkpts);
  318. - if(!GTK_WIDGET_VISIBLE(dbgw.mem))
  319. + if(!gtk_widget_get_visible(dbgw.mem))
  320. gtk_widget_show(dbgw.mem);
  321. - if(!GTK_WIDGET_VISIBLE(dbgw.pclog))
  322. + if(!gtk_widget_get_visible(dbgw.pclog))
  323. gtk_widget_show(dbgw.pclog);
  324. - if(!GTK_WIDGET_VISIBLE(dbgw.code) && all)
  325. + if(!gtk_widget_get_visible(dbgw.code) && all)
  326. gtk_widget_show(dbgw.code);
  327. - if(!GTK_WIDGET_VISIBLE(dbgw.stack))
  328. + if(!gtk_widget_get_visible(dbgw.stack))
  329. gtk_widget_show(dbgw.stack);
  330. - if(!GTK_WIDGET_VISIBLE(dbgw.heap))
  331. + if(!gtk_widget_get_visible(dbgw.heap))
  332. gtk_widget_show(dbgw.heap);
  333. - if(!GTK_WIDGET_VISIBLE(dbgw.iop))
  334. + if(!gtk_widget_get_visible(dbgw.iop))
  335. gtk_widget_show(dbgw.iop);
  336. }
  337. @@ -146,21 +146,21 @@ void dbgwnds_hide_all(int all)
  338. if(options3.dbg_dock)
  339. return;
  340. - if(GTK_WIDGET_VISIBLE(dbgw.regs))
  341. + if(gtk_widget_get_visible(dbgw.regs))
  342. gtk_widget_hide(dbgw.regs);
  343. - if(GTK_WIDGET_VISIBLE(dbgw.bkpts))
  344. + if(gtk_widget_get_visible(dbgw.bkpts))
  345. gtk_widget_hide(dbgw.bkpts);
  346. - if(GTK_WIDGET_VISIBLE(dbgw.mem))
  347. + if(gtk_widget_get_visible(dbgw.mem))
  348. gtk_widget_hide(dbgw.mem);
  349. - if(GTK_WIDGET_VISIBLE(dbgw.pclog))
  350. + if(gtk_widget_get_visible(dbgw.pclog))
  351. gtk_widget_hide(dbgw.pclog);
  352. - if(GTK_WIDGET_VISIBLE(dbgw.code) && all)
  353. + if(gtk_widget_get_visible(dbgw.code) && all)
  354. gtk_widget_hide(dbgw.code);
  355. - if(GTK_WIDGET_VISIBLE(dbgw.stack))
  356. + if(gtk_widget_get_visible(dbgw.stack))
  357. gtk_widget_hide(dbgw.stack);
  358. - if(GTK_WIDGET_VISIBLE(dbgw.heap))
  359. + if(gtk_widget_get_visible(dbgw.heap))
  360. gtk_widget_hide(dbgw.heap);
  361. - if(GTK_WIDGET_VISIBLE(dbgw.iop))
  362. + if(gtk_widget_get_visible(dbgw.iop))
  363. gtk_widget_hide(dbgw.iop);
  364. }
  365. @@ -338,7 +338,7 @@ void update_submenu(GtkWidget *widget, g
  366. if(!options3.dbg_dock)
  367. {
  368. g_signal_handlers_block_by_func(GTK_OBJECT(item), on_registers1_activate, NULL);
  369. - gtk_check_menu_item_set_active(item, GTK_WIDGET_VISIBLE(dbgw.regs));
  370. + gtk_check_menu_item_set_active(item, gtk_widget_get_visible(dbgw.regs));
  371. g_signal_handlers_unblock_by_func(GTK_OBJECT(item), on_registers1_activate, NULL);
  372. }
  373. else
  374. @@ -350,7 +350,7 @@ void update_submenu(GtkWidget *widget, g
  375. if(!options3.dbg_dock)
  376. {
  377. g_signal_handlers_block_by_func(GTK_OBJECT(item), on_breakpoints1_activate, NULL);
  378. - gtk_check_menu_item_set_active(item, GTK_WIDGET_VISIBLE(dbgw.bkpts));
  379. + gtk_check_menu_item_set_active(item, gtk_widget_get_visible(dbgw.bkpts));
  380. g_signal_handlers_unblock_by_func(GTK_OBJECT(item), on_breakpoints1_activate, NULL);
  381. }
  382. else
  383. @@ -362,7 +362,7 @@ void update_submenu(GtkWidget *widget, g
  384. if(!options3.dbg_dock)
  385. {
  386. g_signal_handlers_block_by_func(GTK_OBJECT(item), on_memory1_activate, NULL);
  387. - gtk_check_menu_item_set_active(item, GTK_WIDGET_VISIBLE(dbgw.mem));
  388. + gtk_check_menu_item_set_active(item, gtk_widget_get_visible(dbgw.mem));
  389. g_signal_handlers_unblock_by_func(GTK_OBJECT(item), on_memory1_activate, NULL);
  390. }
  391. else
  392. @@ -372,7 +372,7 @@ void update_submenu(GtkWidget *widget, g
  393. elt = g_list_nth(list, 3);
  394. item = GTK_CHECK_MENU_ITEM(elt->data);
  395. g_signal_handlers_block_by_func(GTK_OBJECT(item), on_pc_log1_activate, NULL);
  396. - gtk_check_menu_item_set_active(item, GTK_WIDGET_VISIBLE(dbgw.pclog));
  397. + gtk_check_menu_item_set_active(item, gtk_widget_get_visible(dbgw.pclog));
  398. g_signal_handlers_unblock_by_func(GTK_OBJECT(item), on_pc_log1_activate, NULL);
  399. // stack
  400. @@ -381,7 +381,7 @@ void update_submenu(GtkWidget *widget, g
  401. if(!options3.dbg_dock)
  402. {
  403. g_signal_handlers_block_by_func(GTK_OBJECT(item), on_stack_frame1_activate, NULL);
  404. - gtk_check_menu_item_set_active(item, GTK_WIDGET_VISIBLE(dbgw.stack));
  405. + gtk_check_menu_item_set_active(item, gtk_widget_get_visible(dbgw.stack));
  406. g_signal_handlers_unblock_by_func(GTK_OBJECT(item), on_stack_frame1_activate, NULL);
  407. }
  408. else
  409. @@ -393,7 +393,7 @@ void update_submenu(GtkWidget *widget, g
  410. if(!options3.dbg_dock)
  411. {
  412. g_signal_handlers_block_by_func(GTK_OBJECT(item), on_heap_frame1_activate, NULL);
  413. - gtk_check_menu_item_set_active(item, GTK_WIDGET_VISIBLE(dbgw.heap));
  414. + gtk_check_menu_item_set_active(item, gtk_widget_get_visible(dbgw.heap));
  415. g_signal_handlers_unblock_by_func(GTK_OBJECT(item), on_heap_frame1_activate, NULL);
  416. }
  417. else
  418. @@ -403,7 +403,7 @@ void update_submenu(GtkWidget *widget, g
  419. elt = g_list_nth(list, 6);
  420. item = GTK_CHECK_MENU_ITEM(elt->data);
  421. g_signal_handlers_block_by_func(GTK_OBJECT(item), on_ioports_frame1_activate, NULL);
  422. - gtk_check_menu_item_set_active(item, GTK_WIDGET_VISIBLE(dbgw.iop));
  423. + gtk_check_menu_item_set_active(item, gtk_widget_get_visible(dbgw.iop));
  424. g_signal_handlers_unblock_by_func(GTK_OBJECT(item), on_ioports_frame1_activate, NULL);
  425. // dock/multi mode
  426. diff -purN tiemu-3.03.orig/src/gui/filesel.c tiemu-3.03/src/gui/filesel.c
  427. --- tiemu-3.03.orig/src/gui/filesel.c 2007-12-16 16:54:33.000000000 +0100
  428. +++ tiemu-3.03/src/gui/filesel.c 2011-11-04 22:45:28.000000000 +0100
  429. @@ -41,7 +41,9 @@
  430. #include <stdio.h>
  431. #include <stdlib.h>
  432. +#undef GTK_DISABLE_DEPRECATED
  433. #include <gtk/gtk.h>
  434. +#define GTK_DISABLE_DEPRECATED
  435. #include <string.h>
  436. #ifdef __WIN32__