Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtk_pizza_set_external is redundant

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-09-12 17:18:23 +00:00
parent 3208e55e12
commit c764029c20
3 changed files with 6 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/gtk/win_gtk.h
View File

@@ -56,8 +56,6 @@ struct _GtkPizza
gint m_width; gint m_width;
GdkWindow *bin_window; GdkWindow *bin_window;
gboolean external_expose;
}; };
struct _GtkPizzaClass struct _GtkPizzaClass
@@ -93,10 +91,6 @@ WXDLLIMPEXP_CORE
void gtk_pizza_set_shadow_type (GtkPizza *pizza, void gtk_pizza_set_shadow_type (GtkPizza *pizza,
GtkMyShadowType type); GtkMyShadowType type);
WXDLLIMPEXP_CORE
void gtk_pizza_set_external (GtkPizza *pizza,
gboolean expose);
WXDLLIMPEXP_CORE WXDLLIMPEXP_CORE
void gtk_pizza_scroll (GtkPizza *pizza, void gtk_pizza_scroll (GtkPizza *pizza,
gint dx, gint dx,

29
src/gtk/win_gtk.c
View File

@@ -64,8 +64,7 @@ static void gtk_pizza_scroll_set_adjustments (GtkPizza *pizza,
GtkAdjustment *hadj, GtkAdjustment *hadj,
GtkAdjustment *vadj); GtkAdjustment *vadj);
/* static */ static GtkWidgetClass* pizza_parent_class;
GtkContainerClass *pizza_parent_class = NULL;
GtkType GtkType
gtk_pizza_get_type () gtk_pizza_get_type ()
@@ -195,8 +194,6 @@ gtk_pizza_init (GtkPizza *pizza)
pizza->m_yoffset = 0; pizza->m_yoffset = 0;
pizza->m_width = -1; pizza->m_width = -1;
pizza->external_expose = FALSE;
} }
GtkWidget* GtkWidget*
@@ -285,16 +282,6 @@ gtk_pizza_set_shadow_type (GtkPizza *pizza,
} }
} }
void
gtk_pizza_set_external (GtkPizza *pizza,
gboolean expose)
{
g_return_if_fail (pizza != NULL);
g_return_if_fail (GTK_IS_PIZZA (pizza));
pizza->external_expose = expose;
}
void void
gtk_pizza_put (GtkPizza *pizza, gtk_pizza_put (GtkPizza *pizza,
GtkWidget *widget, GtkWidget *widget,
@@ -544,8 +531,8 @@ gtk_pizza_unrealize (GtkWidget *widget)
gdk_window_destroy (pizza->bin_window); gdk_window_destroy (pizza->bin_window);
pizza->bin_window = NULL; pizza->bin_window = NULL;
if (GTK_WIDGET_CLASS (pizza_parent_class)->unrealize) if (pizza_parent_class->unrealize)
(* GTK_WIDGET_CLASS (pizza_parent_class)->unrealize) (widget); pizza_parent_class->unrealize(widget);
} }
static void static void
@@ -642,16 +629,12 @@ gtk_pizza_expose (GtkWidget *widget,
g_return_val_if_fail (GTK_IS_PIZZA (widget), FALSE); g_return_val_if_fail (GTK_IS_PIZZA (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE); g_return_val_if_fail (event != NULL, FALSE);
pizza = GTK_PIZZA (widget); pizza = (GtkPizza*)widget;
if (event->window != pizza->bin_window) if (event->window != pizza->bin_window)
return FALSE; return FALSE;
/* We handle all expose events in window.cpp now. */ pizza_parent_class->expose_event(widget, event);
if (pizza->external_expose)
return FALSE;
(* GTK_WIDGET_CLASS (pizza_parent_class)->expose_event) (widget, event);
return FALSE; return FALSE;
} }
@@ -665,7 +648,7 @@ gtk_pizza_style_set(GtkWidget *widget, GtkStyle *previous_style)
gtk_style_set_background(widget->style, GTK_PIZZA(widget)->bin_window, GTK_STATE_NORMAL ); gtk_style_set_background(widget->style, GTK_PIZZA(widget)->bin_window, GTK_STATE_NORMAL );
} }
(* GTK_WIDGET_CLASS (pizza_parent_class)->style_set) (widget, previous_style); pizza_parent_class->style_set(widget, previous_style);
} }
static void static void

6
src/gtk/window.cpp
View File

@@ -78,8 +78,6 @@
#undef HAVE_XIM #undef HAVE_XIM
#endif #endif
extern GtkContainerClass *pizza_parent_class;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// documentation on internals // documentation on internals
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -513,8 +511,6 @@ gtk_window_expose_callback( GtkWidget *widget,
win->GtkSendPaintEvents(); win->GtkSendPaintEvents();
// Let parent window draw window-less widgets // Let parent window draw window-less widgets
(* GTK_WIDGET_CLASS (pizza_parent_class)->expose_event) (widget, gdk_event);
return FALSE; return FALSE;
} }
} }
@@ -2604,8 +2600,6 @@ void wxWindowGTK::PostCreation()
{ {
// these get reported to wxWidgets -> wxPaintEvent // these get reported to wxWidgets -> wxPaintEvent
gtk_pizza_set_external( GTK_PIZZA(m_wxwindow), TRUE );
g_signal_connect (m_wxwindow, "expose_event", g_signal_connect (m_wxwindow, "expose_event",
G_CALLBACK (gtk_window_expose_callback), this); G_CALLBACK (gtk_window_expose_callback), this);