Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

For bug 180147 [gtk2] need to port over the null plugin

Browse Source 
patched by blizzard, robin.lu r=blizzard, robin.lu sr=bryner
Not in default build


git-svn-id: svn://10.0.0.236/trunk@134324 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
robin.lu%sun.com
2002-11-22 10:23:51 +00:00
parent 62fdd9f141
commit f85995dd93
3 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/modules/plugin/samples/default/unix/Makefile.in
View File

@@ -55,6 +55,12 @@ CXXFLAGS += $(MOZ_GTK_CFLAGS)
CFLAGS += $(MOZ_GTK_CFLAGS)
endif
ifdef MOZ_ENABLE_GTK2
EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIB ) $(XLDFLAGS)
CXXFLAGS += $(MOZ_GTK2_CFLAGS)
CFLAGS += $(MOZ_GTK2_CFLAGS)
endif
install-plugin: $(SHARED_LIBRARY)
ifdef SHARED_LIBRARY
$(INSTALL) $(SHARED_LIBRARY) $(DIST)/bin/plugins

7
mozilla/modules/plugin/samples/default/unix/nullplugin.c
View File

@@ -376,7 +376,14 @@ 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));
#endif
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 */