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
This commit is contained in:
@@ -15,9 +15,6 @@
|
|||||||
|
|
||||||
#include "wx/platform.h"
|
#include "wx/platform.h"
|
||||||
#include "wx/gtk/win_gtk.h"
|
#include "wx/gtk/win_gtk.h"
|
||||||
#include "gtk/gtksignal.h"
|
|
||||||
#include "gtk/gtkprivate.h"
|
|
||||||
#include "gdk/gdkx.h"
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
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 (pizza != NULL);
|
||||||
g_return_if_fail (GTK_IS_PIZZA (pizza));
|
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;
|
children = children->next;
|
||||||
|
|
||||||
if ( GTK_WIDGET_VISIBLE (child->widget) &&
|
if ( GTK_WIDGET_VISIBLE (child->widget) &&
|
||||||
!GTK_WIDGET_MAPPED (child->widget) &&
|
!GTK_WIDGET_MAPPED (child->widget) )
|
||||||
TRUE)
|
|
||||||
{
|
{
|
||||||
gtk_widget_map (child->widget);
|
gtk_widget_map (child->widget);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user