[Gnash-commit] gnash/gui fltk.cpp

[Ann Barcomb]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Ann Barcomb <ann>       07/01/25 17:24:35

Modified files:
        gui            : fltk.cpp 

Log message:
        Rolled back the accidental commit of test code Bastiaan was working on 
on
        my machine.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/fltk.cpp?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: fltk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/fltk.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- fltk.cpp    25 Jan 2007 01:00:37 -0000      1.4
+++ fltk.cpp    25 Jan 2007 17:24:35 -0000      1.5
@@ -20,8 +20,7 @@
 
 #include <fltk/Item.h>
 #include <fltk/Window.h>
-//#include <fltk/x11.h>
-#include <fltk/osx.h>
+#include <fltk/x11.h>
 #include <fltk/events.h>
 #include <fltk/run.h>
 #include <fltk/Cursor.h>
@@ -195,8 +194,8 @@
 FltkGui::create()
 {
     // TODO: make the set_xid() call conditional on the availability of X11.
-    if (/*_xid*/ false) {
-      //CreatedWindow::set_xid(this, _xid);
+    if (_xid) {
+      CreatedWindow::set_xid(this, _xid);
     } else {
       Window::create();
     }