fix for crash on 64 bit platforms (patch 1028942)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 9e8bb68ffb6c196e8b574481fc7823a9dec7f35b..ab858209f929bec7555518d5955d30198b78a15b 100644 (file)
--- 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
 - 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:
 
 
 wxMotif:
 

diff --git a/include/wx/gtk/win_gtk.h b/include/wx/gtk/win_gtk.h
index 6440d8490a4c438bba8a32160a70d0a3ec1b5fc9..2afb5ddfb5b4abab51cef2e9e04f4fea8c46eed7 100644 (file)
--- a/include/wx/gtk/win_gtk.h
+++ b/include/wx/gtk/win_gtk.h
@@ -82,7 +82,7 @@ struct _GtkPizzaClass
                                     GtkAdjustment  *vadjustment);
 };
 
                                     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,
 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 6440d8490a4c438bba8a32160a70d0a3ec1b5fc9..2afb5ddfb5b4abab51cef2e9e04f4fea8c46eed7 100644 (file)
--- a/include/wx/gtk1/win_gtk.h
+++ b/include/wx/gtk1/win_gtk.h
@@ -82,7 +82,7 @@ struct _GtkPizzaClass
                                     GtkAdjustment  *vadjustment);
 };
 
                                     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,
 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 97eec73b973b07b97663783791c260e2c5523ce3..633571107e1be809219d13b3625b08ccfc6b2810 100644 (file)
--- 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;
 
 
 static gboolean gravity_works;
 

-guint
+GtkType

 gtk_pizza_get_type ()
 {
 gtk_pizza_get_type ()
 {

-    static guint pizza_type = 0;
+    static GtkType pizza_type = 0;

 
     if (!pizza_type)
     {
 
     if (!pizza_type)
     {

diff --git a/src/gtk1/win_gtk.c b/src/gtk1/win_gtk.c
index 97eec73b973b07b97663783791c260e2c5523ce3..633571107e1be809219d13b3625b08ccfc6b2810 100644 (file)
--- 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;
 
 
 static gboolean gravity_works;
 

-guint
+GtkType

 gtk_pizza_get_type ()
 {
 gtk_pizza_get_type ()
 {

-    static guint pizza_type = 0;
+    static GtkType pizza_type = 0;

 
     if (!pizza_type)
     {
 
     if (!pizza_type)
     {