Re: [Gnash-commit] gnash ChangeLog doc/C/gnash-man.xml doc/C/gnash...

[Bastiaan Jacques]

On Thu, 2007-01-25 at 01:00 +0000, Ann Barcomb wrote:
>       gui            : fltk.cpp 

This was probably committed by accident. It's code I wrote on your
machine that allows one to compile the FLTK GUI on OSX, but it's not
quite ready for CVS yet.

Would you please revert it?

Bastiaan

> 
> Log message:
>       Following a thread on the dev list about the function of -a I updated
>       the manual.

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