[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash gui/gtk.cpp plugin/plugin.cpp
From: |
Markus Gothe |
Subject: |
[Gnash-commit] gnash gui/gtk.cpp plugin/plugin.cpp |
Date: |
Sat, 21 Oct 2006 17:37:00 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Markus Gothe <nihilus> 06/10/21 17:37:00
Modified files:
gui : gtk.cpp
plugin : plugin.cpp
Log message:
Compat fixes...
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.73&r2=1.74
Patches:
Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- gui/gtk.cpp 21 Oct 2006 09:54:44 -0000 1.41
+++ gui/gtk.cpp 21 Oct 2006 17:37:00 -0000 1.42
@@ -84,7 +84,7 @@
add_pixmap_directory (PKGDATADIR);
if (_xid) {
- _window = gtk_plug_new(_xid);
+ _window = gtk_plug_new((GdkNativeWindow)_xid);
dbglogfile << "Created XEmbedded window" << endl;
} else {
_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- plugin/plugin.cpp 21 Oct 2006 17:14:03 -0000 1.73
+++ plugin/plugin.cpp 21 Oct 2006 17:37:00 -0000 1.74
@@ -35,7 +35,7 @@
//
//
-/* $Id: plugin.cpp,v 1.73 2006/10/21 17:14:03 nihilus Exp $ */
+/* $Id: plugin.cpp,v 1.74 2006/10/21 17:37:00 nihilus Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -345,19 +345,9 @@
#endif
}
- NPNToolkitType toolkit;
- CallNPN_GetValueProc(NPNFuncs.getvalue, NULL,
- NPNVToolkit,
- (void *)&toolkit);
-
_width = aWindow->width;
_height = aWindow->height;
- if(toolkit == NPNVGtk2){ //GTK >=2
_window = reinterpret_cast<Window> (aWindow->window);
- }
- else if(toolkit == NPNVGtk12){ //GTK >=1.2
- _window = (Window)(aWindow->window);
- }
return NPERR_NO_ERROR;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash gui/gtk.cpp plugin/plugin.cpp,
Markus Gothe <=