using menu as observer, cleaning in menu theme

1 files changed, 4 insertions, 5 deletions

diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 2ef5793..bb0b352 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Menu.cc,v 1.49 2003/12/16 17:06:51 fluxgen Exp $
+// $Id: Menu.cc,v 1.50 2003/12/17 00:43:22 fluxgen Exp $
 
 //use GNU extensions
 #ifndef  _GNU_SOURCE
@@ -63,7 +63,6 @@ Menu::Menu(MenuTheme &tm, ImageControl &imgctrl):
     m_screen_height(DisplayHeight(FbTk::App::instance()->display(), tm.screenNum())),
     m_alignment(ALIGNDONTCARE),
     m_border_width(0),
-    m_themeobserver(*this), 
     m_need_update(true) {
 
     // setup timers
@@ -78,7 +77,7 @@ Menu::Menu(MenuTheme &tm, ImageControl &imgctrl):
     m_hide_timer.fireOnce(true);
 
     // make sure we get updated when the theme is reloaded
-    tm.addListener(m_themeobserver);
+    tm.reconfigSig().attach(this);
 
     title_vis =
         movable =
@@ -1188,7 +1187,7 @@ void Menu::motionNotifyEvent(XMotionEvent &me) {
                     // setup show menu timer
                     timeval timeout;
                     timeout.tv_sec = 0;
-                    timeout.tv_usec = theme().delayOpen();
+                    timeout.tv_usec = theme().delayOpen() * 1000; // transformed to usec
                     m_submenu_timer.setTimeout(timeout);
                     m_submenu_timer.start();
 
@@ -1400,7 +1399,7 @@ void Menu::closeMenu() {
 void Menu::startHide() {
     timeval timeout;
     timeout.tv_sec = 0;
-    timeout.tv_usec = theme().delayClose();
+    timeout.tv_usec = theme().delayClose() * 1000; // transformed to usec
     m_hide_timer.setTimeout(timeout);
     m_hide_timer.start(); 
 }