1.1 --- a/src/gui/dump_win.c	Mon Oct 08 12:09:06 2007 +0000
     1.2 +++ b/src/gui/dump_win.c	Wed Oct 10 11:02:04 2007 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  /**
     1.5 - * $Id: dump_win.c,v 1.3 2007-10-08 12:06:01 nkeynes Exp $
     1.6 + * $Id: dump_win.c,v 1.4 2007-10-10 11:02:04 nkeynes Exp $
     1.7   *
     1.8   * Implements the memory dump window.
     1.9   *
    1.10 @@ -19,9 +19,9 @@
    1.11  #include <gnome.h>
    1.12  #include <ctype.h>
    1.13  #include <assert.h>
    1.14 -#include "gui.h"
    1.15 -#include "interface.h"
    1.16  #include "mem.h"
    1.17 +#include "gui/gtkui.h"
    1.18 +#include "gui/debugif.h"
    1.19  
    1.20  #define MAX_DUMP_SIZE 4096
    1.21  
    1.22 @@ -70,7 +70,7 @@
    1.23                                                    NULL);
    1.24      gtk_text_view_set_buffer(data->textArea, data->textBuffer);
    1.25      gtk_text_view_set_editable(data->textArea, FALSE);
    1.26 -    gtk_widget_modify_font(GTK_WIDGET(data->textArea),fixed_list_font);
    1.27 +    gtk_widget_modify_font(GTK_WIDGET(data->textArea),gui_fixed_font);
    1.28          
    1.29      g_signal_connect ((gpointer) win, "delete_event",
    1.30                        G_CALLBACK (on_dump_win_delete_event),
    1.31 @@ -82,6 +82,28 @@
    1.32  }
    1.33  
    1.34  
    1.35 +
    1.36 +uint32_t gtk_entry_get_hex_value( GtkEntry *entry, uint32_t defaultValue )
    1.37 +{
    1.38 +    const gchar *text = gtk_entry_get_text(entry);
    1.39 +    if( text == NULL )
    1.40 +        return defaultValue;
    1.41 +    gchar *endptr;
    1.42 +    uint32_t value = strtoul( text, &endptr, 16 );
    1.43 +    if( text == endptr ) { /* invalid input */
    1.44 +        value = defaultValue;
    1.45 +        gtk_entry_set_hex_value( entry, value );
    1.46 +    }
    1.47 +    return value;
    1.48 +}
    1.49 +
    1.50 +void gtk_entry_set_hex_value( GtkEntry *entry, uint32_t value )
    1.51 +{
    1.52 +    char buf[10];
    1.53 +    sprintf( buf, "%08X", value );
    1.54 +    gtk_entry_set_text( entry, buf );
    1.55 +}
    1.56 +
    1.57          
    1.58  gboolean on_dump_win_delete_event( GtkWidget *widget, GdkEvent *event,
    1.59                                     gpointer user_data )