Blame wxGTK-2.4.2-privates.patch

cvsextras 0bb046
diff -ur wxGTK-2.4.2.vanilla/src/gtk/menu.cpp wxGTK-2.4.2/src/gtk/menu.cpp
cvsextras 0bb046
--- wxGTK-2.4.2.vanilla/src/gtk/menu.cpp	2003-09-21 13:31:57.000000000 +0200
cvsextras 0bb046
+++ wxGTK-2.4.2/src/gtk/menu.cpp	2004-05-22 20:57:58.753013328 +0200
cvsextras 0bb046
@@ -30,13 +30,13 @@
cvsextras 0bb046
 #ifdef __WXGTK20__
cvsextras 0bb046
     #include <glib-object.h>
cvsextras 0bb046
 
cvsextras 0bb046
-    #define gtk_accel_group_attach(g, o) _gtk_accel_group_attach((g), (o))
cvsextras 0bb046
-    #define gtk_accel_group_detach(g, o) _gtk_accel_group_detach((g), (o))
cvsextras 0bb046
+    #define gtk_accel_group_attach(g, o) gtk_window_add_accel_group((o), (g))
cvsextras 0bb046
+    #define gtk_accel_group_detach(g, o) gtk_window_remove_accel_group((o), (g))
cvsextras 0bb046
     #define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m)
cvsextras 0bb046
 
cvsextras 0bb046
-    #define ACCEL_OBJECT        GObject
cvsextras 0bb046
+    #define ACCEL_OBJECT        GtkWindow
cvsextras 0bb046
     #define ACCEL_OBJECTS(a)    (a)->acceleratables
cvsextras 0bb046
-    #define ACCEL_OBJ_CAST(obj) G_OBJECT(obj)
cvsextras 0bb046
+    #define ACCEL_OBJ_CAST(obj) ((GtkWindow*) obj)
cvsextras 0bb046
 #else // GTK+ 1.x
cvsextras 0bb046
     #define ACCEL_OBJECT        GtkObject
cvsextras 0bb046
     #define ACCEL_OBJECTS(a)    (a)->attach_objects
cvsextras 0bb046
Endast i wxGTK-2.4.2/src/gtk: menu.cppprivates
cvsextras 0bb046
diff -ur wxGTK-2.4.2.vanilla/src/gtk/settings.cpp wxGTK-2.4.2/src/gtk/settings.cpp
cvsextras 0bb046
--- wxGTK-2.4.2.vanilla/src/gtk/settings.cpp	2003-09-21 13:31:57.000000000 +0200
cvsextras 0bb046
+++ wxGTK-2.4.2/src/gtk/settings.cpp	2004-05-22 20:57:15.330585304 +0200
cvsextras 0bb046
@@ -340,9 +340,20 @@
cvsextras 0bb046
                 }  
cvsextras 0bb046
                 else  
cvsextras 0bb046
                 {  
cvsextras 0bb046
-                    const gchar *font_name =
cvsextras 0bb046
-                        _gtk_rc_context_get_default_font_name(gtk_settings_get_default());
cvsextras 0bb046
-                    g_systemFont = new wxFont(wxString::FromAscii(font_name));
cvsextras 0bb046
+                    GtkSettings *settings = gtk_settings_get_default();
cvsextras 0bb046
+                    gchar *font_name = NULL;
cvsextras 0bb046
+                    g_object_get ( settings,
cvsextras 0bb046
+                                   "gtk-font-name",
cvsextras 0bb046
+                                   &font_name,
cvsextras 0bb046
+                                   NULL);
cvsextras 0bb046
+
cvsextras 0bb046
+                    if (!font_name) 
cvsextras 0bb046
+                            g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
cvsextras 0bb046
+
cvsextras 0bb046
+                    else
cvsextras 0bb046
+	                    g_systemFont = new wxFont(wxString::FromAscii(font_name));
cvsextras 0bb046
+                    g_free (font_name);
cvsextras 0bb046
+			
cvsextras 0bb046
                 }  
cvsextras 0bb046
                 gtk_widget_destroy( widget );
cvsextras 0bb046
 #else
cvsextras 0bb046
Endast i wxGTK-2.4.2/src/gtk: settings.cppprivates