[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog plugin/klash/klash.cpp
From: |
Markus Gothe |
Subject: |
[Gnash-commit] gnash ChangeLog plugin/klash/klash.cpp |
Date: |
Sun, 15 Oct 2006 20:19:42 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Markus Gothe <nihilus> 06/10/15 20:19:42
Modified files:
. : ChangeLog
plugin/klash : klash.cpp
Log message:
Fixed windowid in accordance to Bastiaan's code clean-up in action.cpp.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1222&r2=1.1223
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/klash.cpp?cvsroot=gnash&r1=1.13&r2=1.14
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1222
retrieving revision 1.1223
diff -u -b -r1.1222 -r1.1223
--- ChangeLog 15 Oct 2006 17:02:12 -0000 1.1222
+++ ChangeLog 15 Oct 2006 20:19:42 -0000 1.1223
@@ -2,6 +2,8 @@
* backend/render_handler_agg.cpp: Added log_error on unknown
pixelformat.
+ * plugin/klash/klash.cpp: Fixed windowid in accordance to Bastiaan's
+ code clean-up in action.cpp
2006-10-15 Patrice Dumas <address@hidden>
Index: plugin/klash/klash.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/klash.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- plugin/klash/klash.cpp 28 Aug 2006 11:07:14 -0000 1.13
+++ plugin/klash/klash.cpp 15 Oct 2006 20:19:42 -0000 1.14
@@ -107,7 +107,17 @@
int width;
int height;
-extern int windowid;
+#ifndef GUI_GTK
+int windowid = 0;
+#else
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+extern "C" {
+#include <gtk/gtk.h>
+}
+GdkNativeWindow windowid = 0;
+#endif
+
class EmbedWidget : public QGLWidget
{
Q_OBJECT
- [Gnash-commit] gnash ChangeLog plugin/klash/klash.cpp,
Markus Gothe <=