Attachment #28656 for bug #46737

View | Details | Raw Unified | Return to bug 46737
Collapse All | Expand All




#ifdef __WXGTK20__
    #include <glib-object.h>

    #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        GtkWindow
    #define ACCEL_OBJECTS(a)    (a)->acceleratables
    #define ACCEL_OBJ_CAST(obj) ((GtkWindow*) obj)
#else // GTK+ 1.x
    #define ACCEL_OBJECT        GtkObject
    #define ACCEL_OBJECTS(a)    (a)->attach_objects




                }  
                else  
                {  
                    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

Return to bug 46737

Lines 30-42 Link Here

(-)wxGTK-2.4.2/src/gtk/menu.cpp (-4 / +4 lines)
30	#ifdef __WXGTK20__	30	#ifdef __WXGTK20__
31	#include <glib-object.h>	31	#include <glib-object.h>
32		32
33	#define gtk_accel_group_attach(g, o) _gtk_accel_group_attach((g), (o))	33	#define gtk_accel_group_attach(g, o) gtk_window_add_accel_group((o), (g))
34	#define gtk_accel_group_detach(g, o) _gtk_accel_group_detach((g), (o))	34	#define gtk_accel_group_detach(g, o) gtk_window_remove_accel_group((o), (g))
35	#define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m)	35	#define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m)
36		36
37	#define ACCEL_OBJECT GObject	37	#define ACCEL_OBJECT GtkWindow
38	#define ACCEL_OBJECTS(a) (a)->acceleratables	38	#define ACCEL_OBJECTS(a) (a)->acceleratables
39	#define ACCEL_OBJ_CAST(obj) G_OBJECT(obj)	39	#define ACCEL_OBJ_CAST(obj) ((GtkWindow*) obj)
40	#else // GTK+ 1.x	40	#else // GTK+ 1.x
41	#define ACCEL_OBJECT GtkObject	41	#define ACCEL_OBJECT GtkObject
42	#define ACCEL_OBJECTS(a) (a)->attach_objects	42	#define ACCEL_OBJECTS(a) (a)->attach_objects

Lines 340-348 Link Here

(-)wxGTK-2.4.2/src/gtk/settings.cpp (-3 / +11 lines)
340	}	340	}
341	else	341	else
342	{	342	{
343	const gchar *font_name =	343	GtkSettings *settings = gtk_settings_get_default();
344	_gtk_rc_context_get_default_font_name(gtk_settings_get_default());	344	gchar *font_name = NULL;
345	g_systemFont = new wxFont(wxString::FromAscii(font_name));	345	g_object_get ( settings,
		346	"gtk-font-name",
		347	&font_name,
		348	NULL);
		349	if (!font_name)
		350	g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
		351	else
		352	g_systemFont = new wxFont(wxString::FromAscii(font_name));
		353	g_free (font_name);
346	}	354	}
347	gtk_widget_destroy( widget );	355	gtk_widget_destroy( widget );
348	#else	356	#else