From 9eeadf01e19e1238c15c13c28cf3211e6b6b3fa0 Mon Sep 17 00:00:00 2001 From: "robin.lu%sun.com" Date: Fri, 13 Dec 2002 06:15:14 +0000 Subject: [PATCH] for bug 180147 [gtk2] need to port over the null plugin.patch=robin.lu@sun.com r=blizzard sr=bryner git-svn-id: svn://10.0.0.236/trunk@135226 18797224-902f-48f8-a5cc-f745e15eee43 --- .../plugin/samples/default/unix/nullplugin.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/mozilla/modules/plugin/samples/default/unix/nullplugin.c b/mozilla/modules/plugin/samples/default/unix/nullplugin.c index bb503673aed..cc16402c3ce 100644 --- a/mozilla/modules/plugin/samples/default/unix/nullplugin.c +++ b/mozilla/modules/plugin/samples/default/unix/nullplugin.c @@ -376,14 +376,15 @@ createPixmap(PluginInstance *This) GdkWindow *gdk_window = getGdkWindow(This); if (gdk_window) { -#ifdef MOZ_ENABLE_GTK - style = gtk_widget_get_style((GtkWidget *)gdk_window->user_data); -#endif -#ifdef MOZ_ENABLE_GTK2 - gpoint user_data = nsnull; - gdk_window_get_user_data( gdk_window, user_data); - style = gtk_widget_get_style(GTK_WIDGET(user_data)); + GtkWidget *widget; +#ifndef MOZ_WIDGET_GTK2 + widget = (GtkWidget *)gdk_window->user_data; +#else + gpointer user_data = NULL; + gdk_window_get_user_data( gdk_window, &user_data); + widget = GTK_WIDGET(user_data); #endif + style = gtk_widget_get_style(widget); nullPluginGdkPixmap = gdk_pixmap_create_from_xpm_d(gdk_window , &mask, &style->bg[GTK_STATE_NORMAL], npnul320_xpm); /* Pixmap is created on original X session but used by new session */