[Gnash-commit] /srv/bzr/gnash/trunk r10823: Rename files

[rob]

------------------------------------------------------------
revno: 10823
committer: address@hidden
branch nick: trunk
timestamp: Wed 2009-04-22 10:37:31 -0600
message:
  Rename files
renamed:
  gui/gnash-canvas.cpp => gui/gtk_canvas.cpp
  gui/gnash-canvas.h => gui/gtk_canvas.h
  gui/gtk_widget => gui/pythonmod
modified:
  gui/Makefile.am
  gui/am-frag/gtk.am
  gui/gtk.cpp
  gui/gtksup.h
  gui/pythonmod/Makefile.am
  gui/gtk_canvas.cpp

=== modified file 'gui/Makefile.am'
--- a/gui/Makefile.am   2009-04-21 18:40:48 +0000
+++ b/gui/Makefile.am   2009-04-22 16:37:31 +0000
@@ -27,7 +27,7 @@
 SUBDIRS = .
 # If python support is enabled, built that too
 if USE_PYTHON
-SUBDIRS += gtk_widget
+SUBDIRS += pythonmod
 endif
 
 localedir = $(datadir)/locale

=== modified file 'gui/am-frag/gtk.am'
--- a/gui/am-frag/gtk.am        2009-04-21 18:40:48 +0000
+++ b/gui/am-frag/gtk.am        2009-04-22 16:37:31 +0000
@@ -18,6 +18,14 @@
 #
 # Build the GTK gui
 #
+
+# Build the optional GTK Widget, which currently only works with Cairo
+if BUILD_GTK_WIDGET
+if BUILD_CAIRO_RENDERER
+GTK_CANVAS = gtk_canvas.cpp gtk_canvas.h
+endif
+endif
+
 if BUILD_GTK_GUI
 bin_PROGRAMS += gtk-gnash
 if BUILD_ALP_GUI
@@ -32,14 +40,14 @@
 if BUILD_OGL_RENDERER
 gtk_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
 gtk_gnash_SOURCES += gtk_glue_gtkglext.cpp gtk_glue_gtkglext.h \
-               gtk.cpp gtksup.h gtk_glue.h gnash-canvas.cpp
+               gtk.cpp gtksup.h gtk_glue.h $(GTK_CANVAS)
 gtk_gnash_LDADD = $(top_builddir)/backend/libgnashogl.la \
                $(GNASH_LIBS) $(GTK_LIBS) $(OPENGL_LIBS)
 endif                          # BUILD_OGL_RENDERER
 if BUILD_AGG_RENDERER
 gtk_gnash_CPPFLAGS += $(AGG_CFLAGS)
 gtk_gnash_SOURCES += gtk_glue_agg.cpp gtk_glue_agg.h \
-               gtk.cpp gtksup.h gtk_glue.h gnash-canvas.cpp
+               gtk.cpp gtksup.h gtk_glue.h $(GTK_WIDGET)
 gtk_gnash_LDADD = $(top_builddir)/backend/libgnashagg.la \
                $(GNASH_LIBS) $(GTK_LIBS) $(AGG_LIBS) $(CAIRO_LIBS)
 if HAVE_XV
@@ -50,7 +58,7 @@
 if BUILD_CAIRO_RENDERER
 gtk_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
 gtk_gnash_SOURCES += gtk_glue_cairo.cpp gtk_glue_cairo.h \
-               gtk.cpp gtksup.h gtk_glue.h gnash-canvas.cpp
+               gtk.cpp gtksup.h gtk_glue.h $(GTK_CANVAS)
 gtk_gnash_LDADD = $(top_builddir)/backend/libgnashcairo.la \
                $(GNASH_LIBS) $(GTK_LIBS) $(CAIRO_LIBS)
 endif                          # BUILD_CAIRO_RENDERER

=== modified file 'gui/gtk.cpp'
--- a/gui/gtk.cpp       2009-04-21 18:40:48 +0000
+++ b/gui/gtk.cpp       2009-04-22 16:37:31 +0000
@@ -42,7 +42,9 @@
 #include <gdk/gdkkeysyms.h>
 #include <string>
 
-#include "gnash-canvas.h"
+#ifdef BUILD_CANVAS
+#include "gtk_canvas.h"
+#endif
 
 #ifdef HAVE_FFMPEG_AVCODEC_H
 extern "C" {
@@ -172,13 +174,19 @@
     
     addGnashIcon(GTK_WINDOW(_window));
 
+#ifdef BUILD_CANVAS
     _canvas = gnash_canvas_new();
     gnash_canvas_setup(GNASH_CANVAS(_canvas), argc, argv);
     _renderer = gnash_canvas_get_renderer(GNASH_CANVAS(_canvas));
-
     // Increase reference count to prevent its destruction (which could happen
     // later if we remove it from its container).
     g_object_ref(G_OBJECT(_canvas));
+#else
+    _drawingArea = gtk_drawing_area_new();
+    // Increase reference count to prevent its destruction (which could happen
+    // later if we remove it from its container).
+    g_object_ref(G_OBJECT(_drawingArea));
+#endif
 
     _resumeButton = gtk_button_new();
     gtk_container_add(GTK_CONTAINER(_resumeButton),
@@ -204,12 +212,20 @@
     }
 #endif
 
+#ifdef BUILD_CANVAS
     gtk_box_pack_start(GTK_BOX(_vbox), _canvas, TRUE, TRUE, 0);
+#else
+    gtk_box_pack_start(GTK_BOX(_vbox), _drawingArea, TRUE, TRUE, 0);
+#endif
 
     setupEvents();
 
     gtk_widget_realize(_window);
+#ifdef BUILD_CANVAS
     gtk_widget_show(_canvas);
+#else
+    gtk_widget_show(_drawingArea);
+#endif
     gtk_widget_show(_window);
     
 #ifdef USE_LIRC

=== renamed file 'gui/gnash-canvas.cpp' => 'gui/gtk_canvas.cpp'
--- a/gui/gnash-canvas.cpp      2009-04-21 18:40:48 +0000
+++ b/gui/gtk_canvas.cpp        2009-04-22 16:37:31 +0000
@@ -17,7 +17,11 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "gnash-canvas.h"
+#ifdef HAVE_CONFIG_H
+#include "gnashconfig.h"
+#endif
+
+#include "gtk_canvas.h"
 
 #include "rc.h"
 #include "log.h"

=== renamed file 'gui/gnash-canvas.h' => 'gui/gtk_canvas.h'
=== modified file 'gui/gtksup.h'
--- a/gui/gtksup.h      2009-04-21 18:40:48 +0000
+++ b/gui/gtksup.h      2009-04-22 16:37:31 +0000
@@ -28,7 +28,9 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
-#include "gnash-canvas.h"
+#ifdef BUILD_CANVAS
+#include "gtk_canvas.h"
+#endif
 
 #ifdef GUI_HILDON
 extern "C" {
@@ -154,7 +156,11 @@
     GtkWidget* _overlay;
     
     // The area rendered into by Gnash
+#ifdef BUILD_CANVAS
     GtkWidget* _canvas;
+#else
+    GtkWidget* _drawingArea;
+#endif
 
     GtkMenu* _popup_menu;
     GtkWidget* _menubar;

=== renamed directory 'gui/gtk_widget' => 'gui/pythonmod'
=== modified file 'gui/pythonmod/Makefile.am'
--- a/gui/gtk_widget/Makefile.am        2009-04-21 18:40:48 +0000
+++ b/gui/pythonmod/Makefile.am 2009-04-22 16:37:31 +0000
@@ -41,7 +41,7 @@
        gnash.c \
        gnashmodule.c \
        gnash-view.cpp\
-       $(top_srcdir)/gui/gnash-canvas.cpp \
+       $(top_srcdir)/gui/gtk_canvas.cpp \
        $(top_srcdir)/gui/gtk_glue_cairo.cpp
 
 gnash.c: gnash.defs gnash.override