--- wxGTK-2.4.2/src/gtk/menu.cpp.gtk2.4 2003-09-21 13:31:57.000000000 +0200 +++ wxGTK-2.4.2/src/gtk/menu.cpp 2004-04-08 23:34:36.816645632 +0200 @@ -30,13 +30,13 @@ #ifdef __WXGTK20__ #include <glib-object.h> - #define gtk_accel_group_attach(g, o) _gtk_accel_group_attach((g), (o)) - #define gtk_accel_group_detach(g, o) _gtk_accel_group_detach((g), (o)) + #define gtk_accel_group_attach(g, o) gtk_window_add_accel_group((o), (g)) + #define gtk_accel_group_detach(g, o) gtk_window_remove_accel_group((o), (g)) #define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m) - #define ACCEL_OBJECT GObject + #define ACCEL_OBJECT GtkWindow #define ACCEL_OBJECTS(a) (a)->acceleratables - #define ACCEL_OBJ_CAST(obj) G_OBJECT(obj) + #define ACCEL_OBJ_CAST(obj) ((GtkWindow*) obj) #else // GTK+ 1.x #define ACCEL_OBJECT GtkObject #define ACCEL_OBJECTS(a) (a)->attach_objects @@ -50,8 +50,8 @@ extern void wxapp_install_idle_handler(); extern bool g_isIdle; -#if GTK_CHECK_VERSION(1, 2, 0) && wxUSE_ACCEL - static wxString GetHotKey( const wxMenuItem& item ); +#if wxUSE_ACCEL +static wxString GetHotKey( const wxMenuItem& item ); #endif //----------------------------------------------------------------------------- --- wxGTK-2.4.2/src/gtk/settings.cpp.gtk2.4 2003-09-21 13:31:57.000000000 +0200 +++ wxGTK-2.4.2/src/gtk/settings.cpp 2004-04-08 23:41:42.725897584 +0200 @@ -340,9 +340,17 @@ } else { - const gchar *font_name = - _gtk_rc_context_get_default_font_name(gtk_settings_get_default()); - g_systemFont = new wxFont(wxString::FromAscii(font_name)); + GtkSettings *settings = gtk_settings_get_default(); + gchar *font_name = NULL; + g_object_get ( settings, + "gtk-font-name", + &font_name, + NULL); + if (!font_name) + g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL ); + else + g_systemFont = new wxFont(wxString::FromAscii(font_name)); + g_free (font_name); } gtk_widget_destroy( widget ); #else