[Gnash-commit] /srv/bzr/gnash/trunk r10089: Get value from GTK spin button correctly.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 10089
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Fri 2008-10-24 23:39:58 +0200
message:
  Get value from GTK spin button correctly.
  
  Drop last references to GUI from movie_root. Complete transfer of 
  implementation to AbstractIFaceCallback.
modified:
  gui/Player.cpp
  gui/gtk.cpp
  gui/gui.cpp
  libcore/movie_root.cpp
  libcore/movie_root.h

=== modified file 'gui/Player.cpp'
--- a/gui/Player.cpp    2008-10-23 18:56:00 +0000
+++ b/gui/Player.cpp    2008-10-24 21:39:58 +0000
@@ -452,9 +452,7 @@
 bool
 Player::CallbacksHandler::yesNo(const std::string& query)
 {
-    log_debug(_("Received query from core: '%d'. Answering yes until "
-               "this is implemented properly"), query);
-    return true;
+    return _gui->yesno(query);
 }
 
 std::string

=== modified file 'gui/gtk.cpp'
--- a/gui/gtk.cpp       2008-10-17 15:38:05 +0000
+++ b/gui/gtk.cpp       2008-10-24 21:39:58 +0000
@@ -1086,7 +1086,8 @@
 
         if ( prefs->streamsTimeoutScale ) {
             _rcfile.setStreamsTimeout(
-                   gtk_range_get_value(GTK_RANGE(prefs->streamsTimeoutScale)));
+                gtk_spin_button_get_value_as_int(
+                    GTK_SPIN_BUTTON(prefs->streamsTimeoutScale)));
         }
 
         if ( prefs->ASCodingErrorToggle ) {
@@ -1151,7 +1152,8 @@
 
         if ( prefs->librarySize ) {
             _rcfile.setMovieLibraryLimit(
-                
gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefs->librarySize)));
+                gtk_spin_button_get_value_as_int(
+                    GTK_SPIN_BUTTON(prefs->librarySize)));
         }
 
         if ( prefs->startStoppedToggle ) {

=== modified file 'gui/gui.cpp'
--- a/gui/gui.cpp       2008-10-19 18:04:05 +0000
+++ b/gui/gui.cpp       2008-10-24 21:39:58 +0000
@@ -1221,7 +1221,6 @@
     assert(stage);
     assert(!_stage);
     _stage = stage;
-    _stage->setGui(this);
 }
 
 bool

=== modified file 'libcore/movie_root.cpp'
--- a/libcore/movie_root.cpp    2008-10-24 21:08:57 +0000
+++ b/libcore/movie_root.cpp    2008-10-24 21:39:58 +0000
@@ -119,7 +119,6 @@
        _displayState(normal),
        _recursionLimit(256),
        _timeoutLimit(15),
-       _gui(0),
        _movieAdvancementDelay(83), // ~12 fps by default
        _lastMovieAdvancement(0)
 {
@@ -218,7 +217,7 @@
 {
        bool disable = true;
        if ( _interfaceHandler ) disable = _interfaceHandler->yesNo(msg);
-       else log_error("No gui registered, assuming 'Yes' answer to "
+       else log_error("No user interface registered, assuming 'Yes' answer to "
             "question: %s", msg);
        if ( disable )
        {

=== modified file 'libcore/movie_root.h'
--- a/libcore/movie_root.h      2008-10-23 18:56:00 +0000
+++ b/libcore/movie_root.h      2008-10-24 21:39:58 +0000
@@ -104,7 +104,6 @@
     class Stage_as;
     class URL;
     class Timer;
-    class Gui;
 }
 
 namespace gnash
@@ -141,11 +140,6 @@
 
     ~movie_root();
 
-    void setGui(Gui* g)
-    {
-        _gui=g;
-    }
-
     /// Set the root movie, replacing the current one if any.
     //
     /// This is needed for the cases in which the top-level movie
@@ -1120,9 +1114,6 @@
     // ScriptLimits tag.    
     boost::uint16_t _timeoutLimit;
 
-    /// Hosting app gui, externally owned
-    Gui* _gui;
-
     void handleActionLimitHit(const std::string& ref);
 
     // delay between movie advancement, in milliseconds