From 94bb67b45c07c8ba6fa94be17852e29958d6c75d Mon Sep 17 00:00:00 2001
From: amartin <olpc@xo-05-28-21.localdomain>
Date: Mon, 10 Sep 2007 05:03:46 +0000
Subject: Merge branch 'master' of git+ssh://amartin@dev.laptop.org/git/projects/tamtam

---
(limited to 'Edit')

diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py
index e34fc19..58f82f1 100644
--- a/Edit/MainWindow.py
+++ b/Edit/MainWindow.py
@@ -2053,13 +2053,13 @@ class InstrumentButton( gtk.DrawingArea ):
     def set_palette(self, palette):
         self._palette = palette
         self._palette.props.invoker = WidgetInvoker(self)
+        self._palette.props.invoker._position_hint = WidgetInvoker.AT_CURSOR #This is a hack, will change with newer Palette API
             
+        
 class instrumentPalette(Palette):
     def __init__(self, label, trackID, edit):
         Palette.__init__(self, label)
-        
-        self.set_property("position", Palette.AT_CURSOR)
-
+     
         self.trackID = trackID
         self.edit = edit
         
@@ -2087,5 +2087,5 @@ class instrumentPalette(Palette):
         self.volumeBox.pack_start(self.volumeSlider, padding = 5)
         self.volumeBox.show_all()
 
-        self.set_content(self.volumeBox)  
+        self.set_content(self.volumeBox)
     
\ No newline at end of file
--
cgit v0.9.1