diff --git a/docs/changes.txt b/docs/changes.txt index 9e8bb68ffb..ab858209f9 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -258,6 +258,7 @@ wxGTK: - implemented alpha channel support in wxBitmap - added native GTK+2 wxArtProvider implementation with ability to load icons from icon theme in addition to recognized stock art +- fixed crash on 64 bit platforms (Paul Cornett) wxMotif: diff --git a/include/wx/gtk/win_gtk.h b/include/wx/gtk/win_gtk.h index 6440d8490a..2afb5ddfb5 100644 --- a/include/wx/gtk/win_gtk.h +++ b/include/wx/gtk/win_gtk.h @@ -82,7 +82,7 @@ struct _GtkPizzaClass GtkAdjustment *vadjustment); }; -guint gtk_pizza_get_type (void); +GtkType gtk_pizza_get_type (void); GtkWidget* gtk_pizza_new (void); void gtk_pizza_set_shadow_type (GtkPizza *pizza, diff --git a/include/wx/gtk1/win_gtk.h b/include/wx/gtk1/win_gtk.h index 6440d8490a..2afb5ddfb5 100644 --- a/include/wx/gtk1/win_gtk.h +++ b/include/wx/gtk1/win_gtk.h @@ -82,7 +82,7 @@ struct _GtkPizzaClass GtkAdjustment *vadjustment); }; -guint gtk_pizza_get_type (void); +GtkType gtk_pizza_get_type (void); GtkWidget* gtk_pizza_new (void); void gtk_pizza_set_shadow_type (GtkPizza *pizza, diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c index 97eec73b97..633571107e 100644 --- a/src/gtk/win_gtk.c +++ b/src/gtk/win_gtk.c @@ -104,10 +104,10 @@ static GtkContainerClass *pizza_parent_class = NULL; static gboolean gravity_works; -guint +GtkType gtk_pizza_get_type () { - static guint pizza_type = 0; + static GtkType pizza_type = 0; if (!pizza_type) { diff --git a/src/gtk1/win_gtk.c b/src/gtk1/win_gtk.c index 97eec73b97..633571107e 100644 --- a/src/gtk1/win_gtk.c +++ b/src/gtk1/win_gtk.c @@ -104,10 +104,10 @@ static GtkContainerClass *pizza_parent_class = NULL; static gboolean gravity_works; -guint +GtkType gtk_pizza_get_type () { - static guint pizza_type = 0; + static GtkType pizza_type = 0; if (!pizza_type) {