changes to make wxGTK compile with GTK+ 2.0: now it does but the minimal
sample crashes on startup git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -30,9 +30,8 @@
 | 
			
		||||
 | 
			
		||||
#include <strings.h>
 | 
			
		||||
 | 
			
		||||
#include <gdk/gdk.h>
 | 
			
		||||
#include "wx/gtk/private.h"
 | 
			
		||||
#include <gdk/gdkprivate.h>
 | 
			
		||||
#include <gtk/gtk.h>
 | 
			
		||||
 | 
			
		||||
// ----------------------------------------------------------------------------
 | 
			
		||||
// constants
 | 
			
		||||
@@ -656,13 +655,13 @@ extern GdkFont *GtkGetDefaultGuiFont()
 | 
			
		||||
        GtkStyle *def = gtk_rc_get_style( widget );
 | 
			
		||||
        if (def)
 | 
			
		||||
        {
 | 
			
		||||
            g_systemDefaultGuiFont = gdk_font_ref( def->font );
 | 
			
		||||
            g_systemDefaultGuiFont = gdk_font_ref( GET_STYLE_FONT(def) );
 | 
			
		||||
        }
 | 
			
		||||
        else
 | 
			
		||||
        {
 | 
			
		||||
            def = gtk_widget_get_default_style();
 | 
			
		||||
            if (def)
 | 
			
		||||
                g_systemDefaultGuiFont = gdk_font_ref( def->font );
 | 
			
		||||
                g_systemDefaultGuiFont = gdk_font_ref( GET_STYLE_FONT(def) );
 | 
			
		||||
        }
 | 
			
		||||
        gtk_widget_destroy( widget );
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user