[Gnash-commit] gnash ChangeLog extensions/dejagnu/dejagnu.cpp ...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/01/22 21:23:14

Modified files:
        .              : ChangeLog 
        extensions/dejagnu: dejagnu.cpp 
        extensions/gtk2: gtkext.cpp 

Log message:
        naively fix warnings..

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5472&r2=1.5473
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/dejagnu/dejagnu.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/gtk2/gtkext.cpp?cvsroot=gnash&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5472
retrieving revision 1.5473
diff -u -b -r1.5472 -r1.5473
--- ChangeLog   22 Jan 2008 21:04:54 -0000      1.5472
+++ ChangeLog   22 Jan 2008 21:23:14 -0000      1.5473
@@ -1,5 +1,10 @@
 2008-01-22 Sandro Santilli <address@hidden>
 
+       * extensions/dejagnu/dejagnu.cpp, extensions/gtk2/gtkext.cpp:
+         naively fix warnings..
+
+2008-01-22 Sandro Santilli <address@hidden>
+
        * server/impl.cpp (clear):
          unregister the render handler, and do so *after* the GC collect
          runs, clear the movie root before that.

Index: extensions/dejagnu/dejagnu.cpp
===================================================================
RCS file: /sources/gnash/gnash/extensions/dejagnu/dejagnu.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- extensions/dejagnu/dejagnu.cpp      22 Jan 2008 21:13:16 -0000      1.13
+++ extensions/dejagnu/dejagnu.cpp      22 Jan 2008 21:23:14 -0000      1.14
@@ -117,6 +117,8 @@
        string text = fn.arg(0).to_string();
        return as_value(ptr->obj.pass(text.c_str()));
     }
+
+    return as_value();
 }
 
 as_value
@@ -129,6 +131,8 @@
        string text = fn.arg(0).to_string();
        return as_value(ptr->obj.fail(text.c_str()));
     }
+
+    return as_value();
 }
 
 as_value

Index: extensions/gtk2/gtkext.cpp
===================================================================
RCS file: /sources/gnash/gnash/extensions/gtk2/gtkext.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- extensions/gtk2/gtkext.cpp  22 Jan 2008 21:13:15 -0000      1.10
+++ extensions/gtk2/gtkext.cpp  22 Jan 2008 21:23:14 -0000      1.11
@@ -81,7 +81,7 @@
 }
 
 static void
-generic_callback(GtkWidget *widget, gpointer data)
+generic_callback(GtkWidget * /*widget*/, gpointer data)
 {
 //    GNASH_REPORT_FUNCTION;
 //    g_print ("Hello World - %d\n", *(int *)data;
@@ -120,14 +120,14 @@
 {
 //    GNASH_REPORT_FUNCTION;
 
-    obj->init_member("window_new", &gtkext_window_new);
-    obj->init_member("signal_connect", &gtkext_signal_connect);
-    obj->init_member("container_set_border_width", 
&gtkext_container_set_border_width);
-    obj->init_member("button_new_with_label", &gtkext_button_new_with_label);
-    obj->init_member("signal_connect_swapped", &gtkext_signal_connect_swapped);
-    obj->init_member("container_add", &gtkext_container_add);
-    obj->init_member("widget_show", &gtkext_widget_show);
-    obj->init_member("main", &gtkext_main);
+    obj->init_member("window_new", new builtin_function(gtkext_window_new));
+    obj->init_member("signal_connect", new 
builtin_function(gtkext_signal_connect));
+    obj->init_member("container_set_border_width", new 
builtin_function(gtkext_container_set_border_width));
+    obj->init_member("button_new_with_label", new 
builtin_function(gtkext_button_new_with_label));
+    obj->init_member("signal_connect_swapped", new 
builtin_function(gtkext_signal_connect_swapped));
+    obj->init_member("container_add", new 
builtin_function(gtkext_container_add));
+    obj->init_member("widget_show", new builtin_function(gtkext_widget_show));
+    obj->init_member("main", new builtin_function(gtkext_main));
 }
 
 static as_object*
@@ -142,7 +142,7 @@
 }
 
 static as_value
-gtkext_ctor(const fn_call& fn)
+gtkext_ctor(const fn_call& /*fn*/)
 {
 //    GNASH_REPORT_FUNCTION;
     GtkExt *obj = new GtkExt();
@@ -228,7 +228,7 @@
        GtkExt *window = dynamic_cast<GtkExt *>(fn.arg(0).to_object().get());
        string name = fn.arg(1).to_string();
        as_value func = fn.arg(2).to_as_function();
-       int data = fn.arg(3).to_number();
+       //int data = fn.arg(3).to_int();
 
        dbglogfile << "Adding callback " << func.to_string()
                   << " for event \"" << name << "\"" << endl;
@@ -249,7 +249,7 @@
     
     if (fn.nargs > 0) {
        GtkExt *window = dynamic_cast<GtkExt *>(fn.arg(0).to_object().get());
-       int width = fn.arg(1).to_number();
+       int width = fn.arg(1).to_int();
        window->container_set_border_width(width);
        dbglogfile << "set container border width to " << width << " !" << endl;
     }