X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=MainControlWindow.py;h=c8706d9b0368717d579f457c0a4e511cf31cd48b;hb=e25955fe11da68612055397fc0a0e652b9971377;hp=4866134766793687c48d1df1fcc6483c88990d01;hpb=1094f7f4581a9c0074294004bbd8c934593a54d5;p=pygdb.git

diff --git a/MainControlWindow.py b/MainControlWindow.py
index 4866134..c8706d9 100644
--- a/MainControlWindow.py
+++ b/MainControlWindow.py
@@ -10,21 +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, quitonclose=True):
+	def __init__(self, dbgterm):
 
 		#Set up GTK stuff
 		gtk.Window.__init__(self)
-		if quitonclose:
-			self.connect("destroy", lambda *w: gtk.main_quit() )
+		self.connect("destroy", DbgTerminal.quitHandler )
+
+		#Callbacks for new positions
+		self.newPosCbs = []
 
 		#Set terminals
 		self.dbgterm = dbgterm
@@ -40,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")
@@ -64,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)