[Gnash-commit] gnash ChangeLog gui/gtk.cpp gui/gui.cpp

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/01/05 16:22:37

Modified files:
        .              : ChangeLog 
        gui            : gtk.cpp gui.cpp 

Log message:
                * gui/gui.cpp: add messages for unimplemented fullscreen.
                * gui/gtk.cpp: cleanup, comment out tree display (we don't need 
two
                  of the same thing for the release).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5319&r2=1.5320
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.126&r2=1.127
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.123&r2=1.124

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5319
retrieving revision 1.5320
diff -u -b -r1.5319 -r1.5320
--- ChangeLog   5 Jan 2008 15:40:13 -0000       1.5319
+++ ChangeLog   5 Jan 2008 16:22:36 -0000       1.5320
@@ -1,3 +1,9 @@
+2008-01-05 Benjamin Wolsey <address@hidden>
+
+        * gui/gui.cpp: add messages for unimplemented fullscreen.
+        * gui/gtk.cpp: cleanup, comment out tree display (we don't need two
+          of the same thing for the release).
+
 2008-01-05 Sandro Santilli <address@hidden>
 
        * testsuite/actionscript.all/TextField.as: check that a textfield

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- gui/gtk.cpp 3 Jan 2008 15:46:58 -0000       1.126
+++ gui/gtk.cpp 5 Jan 2008 16:22:37 -0000       1.127
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: gtk.cpp,v 1.126 2008/01/03 15:46:58 bwy Exp $ */
+/* $Id: gtk.cpp,v 1.127 2008/01/05 16:22:37 bwy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -501,7 +501,6 @@
 void
 GtkGui::unsetFullscreen()
 {
-
     if (!_fullscreen) return;
     
     // Plugin
@@ -1101,6 +1100,7 @@
 
     else {
 
+#if 1
             // Table display
             // This left in while tree information isn't selectable
 
@@ -1132,6 +1132,7 @@
                 --size;
             }
 
+#else
             // Tree display
             // Should replace table display when proper
             // InfoTrees are available 
@@ -1191,6 +1192,7 @@
             //Add tree to scrollwindow.
             gtk_container_add (GTK_CONTAINER (scrollwindow1), treeview);
 
+#endif
             }
 
     GtkWidget *bbox1 = gtk_hbutton_box_new ();
@@ -1210,7 +1212,6 @@
 
 GtkTreeModel*
 GtkGui::makeTreeModel (std::auto_ptr<InfoTree> treepointer)
-
 {
 
      InfoTree& info = *treepointer;
@@ -1415,7 +1416,6 @@
 
        GtkGui* gui = static_cast<GtkGui*>(data);
 
-
        int xmin = event->area.x, xmax = event->area.x + event->area.width,
            ymin = event->area.y, ymax = event->area.y + event->area.height;
           

Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- gui/gui.cpp 3 Jan 2008 15:46:58 -0000       1.123
+++ gui/gui.cpp 5 Jan 2008 16:22:37 -0000       1.124
@@ -126,7 +126,8 @@
     _depth(depth),
     _interval(0),
     _renderer(NULL),
-    _redraw_flag(true)
+    _redraw_flag(true),
+    _fullscreen(false)
 #ifdef GNASH_FPS_DEBUG
     ,fps_counter(0)    
     ,fps_counter_total(0)    
@@ -161,11 +162,13 @@
 void
 Gui::setFullscreen()
 {
+    log_unimpl("Fullscreen not yet supported in this GUI");
 }
 
 void
 Gui::unsetFullscreen()
 {
+    log_unimpl("Fullscreen not yet supported in this GUI");
 }
 
 void
@@ -179,7 +182,6 @@
        } 
 }
 
-
 void
 Gui::menu_restart()
 {
@@ -972,4 +974,3 @@
 
 // end of namespace
 }
-