replace deprecated gtk_type_new, plus minor cleanup

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

diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index f700ab07cb294d82e37709d8f1968dd7c6c98c7c..4862d3b4936570622da956ab913d98be2ae72af7 100644 (file)
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -15,9 +15,6 @@
 
 #include "wx/platform.h"
 #include "wx/gtk/win_gtk.h"
 
 #include "wx/platform.h"
 #include "wx/gtk/win_gtk.h"

-#include "gtk/gtksignal.h"
-#include "gtk/gtkprivate.h"
-#include "gdk/gdkx.h"

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "C" {


@@ -211,7 +208,7 @@ gtk_pizza_new ()
 {
     GtkPizza *pizza;
 
 {
     GtkPizza *pizza;
 

-    pizza = gtk_type_new (gtk_pizza_get_type ());
+    pizza = g_object_new (gtk_pizza_get_type (), NULL);

 
     return GTK_WIDGET (pizza);
 }
 
     return GTK_WIDGET (pizza);
 }


@@ -231,7 +228,7 @@ gtk_pizza_set_shadow_type (GtkPizza        *pizza,
     g_return_if_fail (pizza != NULL);
     g_return_if_fail (GTK_IS_PIZZA (pizza));
 
     g_return_if_fail (pizza != NULL);
     g_return_if_fail (GTK_IS_PIZZA (pizza));
 

-    if ((GtkMyShadowType) pizza->shadow_type != type)
+    if (pizza->shadow_type != type)

     {
         pizza->shadow_type = type;
 
     {
         pizza->shadow_type = type;
 


@@ -358,8 +355,7 @@ gtk_pizza_map (GtkWidget *widget)
         children = children->next;
 
         if ( GTK_WIDGET_VISIBLE (child->widget) &&
         children = children->next;
 
         if ( GTK_WIDGET_VISIBLE (child->widget) &&

-            !GTK_WIDGET_MAPPED (child->widget) &&
-            TRUE)
+            !GTK_WIDGET_MAPPED (child->widget) )

         {
             gtk_widget_map (child->widget);
         }
         {
             gtk_widget_map (child->widget);
         }