X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=MainControlWindow.py;h=c8706d9b0368717d579f457c0a4e511cf31cd48b;hb=d7a00b7d9d8b49655f714abc53361bed08e0355d;hp=6dbbf2e101b5698ae01e4a35bc5e8350773c746c;hpb=054679cd2c3372717bf7982407e2453428193581;p=pygdb.git

diff --git a/MainControlWindow.py b/MainControlWindow.py
index 6dbbf2e..c8706d9 100644
--- a/MainControlWindow.py
+++ b/MainControlWindow.py
@@ -10,22 +10,20 @@ import sys
 import vte
 
 
-import GdbTerminal
+import DbgTerminal
 import ClientIOTerminal
 
 
 class MainControlWindow (gtk.Window):
 
-	#Callbacks for new positions
-	newPosCbs = []
-
-	def __init__(self, dbgterm, closecb=None):
+	def __init__(self, dbgterm):
 
 		#Set up GTK stuff
 		gtk.Window.__init__(self)
+		self.connect("destroy", DbgTerminal.quitHandler )
 
-		if closecb!=None:
-			self.connect("destroy", lambda *w: closecb() )
+		#Callbacks for new positions
+		self.newPosCbs = []
 
 		#Set terminals
 		self.dbgterm = dbgterm
@@ -41,8 +39,8 @@ class MainControlWindow (gtk.Window):
 		self.add(vbox)
 
 		#Button box
-		hbtnbox = gtk.HButtonBox()
-		hbtnbox.set_layout(gtk.BUTTONBOX_START)
+		hbtnbox = gtk.HBox(False, spacing=5)
+		#hbtnbox.set_layout(gtk.BUTTONBOX_START)
 		vbox.pack_start(hbtnbox)
 
 		self.runBtn = gtk.Button("Run")
@@ -65,8 +63,10 @@ class MainControlWindow (gtk.Window):
 
 		#Install handlers
 		self.runBtnHandler = self.runBtn.connect('clicked', self.runBtnClicked)
-		self.continueBtnHandler = self.continueBtn.connect('clicked', self.continueBtnClicked)
-		self.stepoverBtnHandler = self.stepoverBtn.connect('clicked', self.stepoverBtnClicked)
+		self.continueBtnHandler = self.continueBtn.connect('clicked', \
+				self.continueBtnClicked)
+		self.stepoverBtnHandler = self.stepoverBtn.connect('clicked', \
+				self.stepoverBtnClicked)
 		self.stepinBtnHandler = self.stepinBtn.connect('clicked', self.stepinBtnClicked)
 		self.quitBtnHandler = self.quitBtn.connect('clicked', self.quitBtnClicked)