[Gnash-commit] /srv/bzr/gnash/trunk r11455: migrate to new GUI API

[Markus Gothe]

------------------------------------------------------------
revno: 11455
committer: Markus Gothe <address@hidden>
branch nick: trunk
timestamp: Sun 2009-08-30 02:47:07 +0200
message:
  migrate to new GUI API
modified:
  gui/aqua.cpp
  gui/aqua_glue.h
  gui/aqua_ogl_glue.cpp
  gui/aqua_ogl_glue.h
  gui/aquasup.h

=== modified file 'gui/aqua.cpp'
--- a/gui/aqua.cpp      2009-07-13 09:15:53 +0000
+++ b/gui/aqua.cpp      2009-08-30 00:47:07 +0000
@@ -21,22 +21,32 @@
 #include "gnashconfig.h"
 #endif
 
+#if defined(_WIN32) || defined(WIN32)
+# include "getopt_win32.h"
+#else
 extern "C"{
-#ifdef HAVE_GETOPT_H
-       #include <getopt.h>
-#endif
+# ifdef HAVE_GETOPT_H
+#  include <getopt.h>
+# endif
+# ifndef __GNUC__
+  extern int getopt(int, char *const *, const char *);
+# endif
 }
+#endif // Win32
+
 
 #include "gnash.h"
-#include "gui.h"
 #include "aquasup.h"
 #include "log.h"
 #include "movie_root.h"
+#include "RunResources.h"
 
 #include "Renderer.h"
 
 #include <Carbon/Carbon.h>
 
+using namespace std;
+
 namespace gnash {
 
 /* Main window widget */
@@ -118,10 +128,10 @@
        
        _glue.init(argc, argv);
 
-    _renderer = _glue.createRenderHandler();
+    _renderer.reset(_glue.createRenderHandler());
     if(!_renderer)return false;
 
-    set_Renderer(_renderer);
+       _runResources.setRenderer(boost::shared_ptr<Renderer>(_renderer));
     return true;
 
 }

=== modified file 'gui/aqua_glue.h'
--- a/gui/aqua_glue.h   2009-07-10 15:44:55 +0000
+++ b/gui/aqua_glue.h   2009-08-30 00:47:07 +0000
@@ -19,6 +19,11 @@
 #ifndef AQUA_GLUE_H
 #define AQUA_GLUE_H
 
+#ifdef HAVE_CONFIG_H
+#include "gnashconfig.h"
+#endif
+
+
 #include "gnash.h"
 #include "snappingrange.h"
 #include <AGL/agl.h>

=== modified file 'gui/aqua_ogl_glue.cpp'
--- a/gui/aqua_ogl_glue.cpp     2009-07-10 15:44:55 +0000
+++ b/gui/aqua_ogl_glue.cpp     2009-08-30 00:47:07 +0000
@@ -16,9 +16,6 @@
 
 
 #include "aqua_ogl_glue.h"
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#include <OpenGL/glext.h>
 #include "log.h"
 
 #define OVERSIZE 1.0f
@@ -45,12 +42,7 @@
 }
 
 
-bool
-#ifdef FIX_I810_LOD_BIAS
-AquaOglGlue::init(int argc, char** argv[])
-#else
-AquaOglGlue::init(int, char***)
-#endif
+bool AquaOglGlue::init(int argc, char **argv[])
 {
 //    GNASH_REPORT_FUNCTION;
 #ifdef FIX_I810_LOD_BIAS

=== modified file 'gui/aqua_ogl_glue.h'
--- a/gui/aqua_ogl_glue.h       2009-07-20 17:31:35 +0000
+++ b/gui/aqua_ogl_glue.h       2009-08-30 00:47:07 +0000
@@ -19,10 +19,8 @@
 #ifndef AQUA_OGL_GLUE_H
 #define AQUA_OGL_GLUE_H
 
+#include "Renderer_ogl.h"
 #include "aqua_glue.h"
-#include "Renderer_ogl.h"
-#include <AGL/agl.h>
-
 
 namespace gnash
 {
@@ -33,7 +31,7 @@
     AquaOglGlue();
     virtual ~AquaOglGlue();
 
-    bool init(int argc, char ***argv);
+    bool init(int argc, char **argv[]);
     Renderer* createRenderHandler();
     bool prepDrawingArea(int width, int height, AGLDrawable drawable);
     void setInvalidatedRegions(const InvalidatedRanges& /* ranges */);

=== modified file 'gui/aquasup.h'
--- a/gui/aquasup.h     2009-07-13 09:15:53 +0000
+++ b/gui/aquasup.h     2009-08-30 00:47:07 +0000
@@ -59,7 +59,7 @@
        public:
        AquaGui(unsigned long xid, float scale, bool loop, RunResources& r);
     virtual ~AquaGui();
-    virtual bool init(int argc, char ***argv);
+    virtual bool init(int argc, char **argv[]);
     virtual void setCursor(gnash_cursor_type newcursor);
     virtual bool createWindow(const char* title, int width, int height);
     virtual bool run();