Complete separation of abstract MapWindow class

git-svn-id: file:///svnroot/wifihood/trunk@71 c51dfc6a-5949-4919-9c8e-f207a149c383

diff --git a/wifiscanner/wifiview.py b/wifiscanner/wifiview.py
index 6addd36..fa15bf9 100755 (executable)
--- a/wifiscanner/wifiview.py
+++ b/wifiscanner/wifiview.py
@@ -237,8 +237,7 @@ class AbstractMapWindow:
 
         self.connect("key-press-event", self.on_key_press)
 
-        vbox = gtk.VBox(False, 0)
-        self.add( vbox )
+        self.vbox = gtk.VBox(False, 0)
 
         # To get explicit GDK_BUTTON_PRESS instead of paired GDK_LEAVE_NOTIFY & GDK_ENTER_NOTIFY
 #        self.add_events(gtk.gdk.BUTTON_MOTION_MASK | gtk.gdk.BUTTON_PRESS_MASK | gtk.gdk.BUTTON_RELEASE_MASK | gtk.gdk.POINTER_MOTION_MASK)
@@ -250,12 +249,7 @@ class AbstractMapWindow:
         #
         self.config = wifimap.config.Configuration()
         self.map = mapWidget( self.config )
-        vbox.pack_end( self.map , True , True , 5)
-
-        self.create_menu( vbox )
-
-        # and the window
-        self.show_all()
+        self.vbox.pack_end( self.map , True , True , 5)
 
         self.size_x , self.size_y = 800 , 480
         self.click_x , self.click_y = None , None
@@ -274,6 +268,9 @@ if hildon :
         def __init__(self):
             hildon.Window.__init__( self )
             AbstractMapWindow.__init__(self)
+            self.add( self.vbox )
+            self.create_menu( self.vbox )
+            self.show_all()
 
         def create_menu ( self , vbox ) :
 
@@ -301,6 +298,10 @@ else :
         def __init__(self):
             gtk.Window.__init__( self , gtk.WINDOW_TOPLEVEL )
             AbstractMapWindow.__init__(self)
+            self.add( self.vbox )
+            self.create_menu( self.vbox )
+            self.show_all()
+
             self.resize( self.size_x , self.size_y)
 
         def create_menu ( self , vbox ) :