1.1 --- a/src/gui/mmio_win.c	Mon Oct 08 11:52:13 2007 +0000
     1.2 +++ b/src/gui/mmio_win.c	Wed Oct 10 11:02:04 2007 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  /**
     1.5 - * $Id: mmio_win.c,v 1.6 2007-10-08 11:48:56 nkeynes Exp $
     1.6 + * $Id: mmio_win.c,v 1.7 2007-10-10 11:02:04 nkeynes Exp $
     1.7   *
     1.8   * Implements the MMIO register viewing window
     1.9   *
    1.10 @@ -18,9 +18,9 @@
    1.11  
    1.12  #include <stdint.h>
    1.13  #include <gnome.h>
    1.14 -#include "interface.h"
    1.15 -#include "callbacks.h"
    1.16 -#include "gui.h"
    1.17 +#include "debugif.h"
    1.18 +#include "debugcb.h"
    1.19 +#include "gui/gtkui.h"
    1.20  #include "mem.h"
    1.21  #include "mmio.h"
    1.22  
    1.23 @@ -84,7 +84,7 @@
    1.24      gtk_clist_set_column_title(list, 3, "Bit Pattern");
    1.25      gtk_clist_set_column_title(list, 4, "Description");
    1.26      gtk_clist_column_titles_show(list);
    1.27 -    gtk_widget_modify_font( GTK_WIDGET(list), fixed_list_font );
    1.28 +    gtk_widget_modify_font( GTK_WIDGET(list), gui_fixed_font );
    1.29      gtk_widget_show( GTK_WIDGET(list) );
    1.30      tab = gtk_label_new(_(name));
    1.31      gtk_widget_show( tab );
    1.32 @@ -128,15 +128,15 @@
    1.33                  
    1.34                  gtk_clist_set_text( page, j, 2, data );
    1.35                  gtk_clist_set_text( page, j, 3, bits );
    1.36 -                gtk_clist_set_foreground( page, j, &clrChanged );
    1.37 +                gtk_clist_set_foreground( page, j, &gui_colour_changed );
    1.38                  
    1.39                  gtk_clist_set_text( all_page, count, 2, data );
    1.40                  gtk_clist_set_text( all_page, count, 3, bits );
    1.41 -                gtk_clist_set_foreground( all_page, count, &clrChanged );
    1.42 +                gtk_clist_set_foreground( all_page, count, &gui_colour_changed );
    1.43                  
    1.44              } else {
    1.45 -                gtk_clist_set_foreground( page, j, &clrNormal );
    1.46 -                gtk_clist_set_foreground( all_page, count, &clrNormal );
    1.47 +                gtk_clist_set_foreground( page, j, &gui_colour_normal );
    1.48 +                gtk_clist_set_foreground( all_page, count, &gui_colour_normal );
    1.49              }
    1.50              count++;
    1.51          }