From 5335e839fb3b0d4a6b01bff1ef7f5d01b36b7ebf Mon Sep 17 00:00:00 2001
From: Kshitij <Kshitij@Kshitijs-MacBook-Pro.local>
Date: Fri, 14 Dec 2012 14:53:18 +0000
Subject: PyGI changes

---
diff --git a/colors.py b/colors.py
index e8a2388..0e75d94 100755
--- a/colors.py
+++ b/colors.py
@@ -46,7 +46,7 @@ except (ImportError, AttributeError):
 from colorsc import *
 
 # Import PyGTK.
-import pygtk, pango
+import gi, pango
 from gi.repository import Gtk
 from gi.repository import GObject
 # Needed to avoid thread crashes with GStreamer
@@ -132,7 +132,7 @@ class BrushControlsPanel(gtk.HBox):
         self.sizebar.set_property("draw-value", False)
         self.sizebar.set_property("inverted", True)
         self.sizebar.connect('value-changed', self.on_size_change)
-        sizebox.pack_end(self.sizebar)
+        sizebox.pack_end(self.sizebar, True, True, 0)
         self.sizecheck = gtk.CheckButton(_('Sensitive'))
         self.sizecheck.connect('toggled', self.on_variable_size_toggle)
         sizebox.pack_end(self.sizecheck, False)
@@ -146,7 +146,7 @@ class BrushControlsPanel(gtk.HBox):
         self.opacitybar.set_property("draw-value", False)
         self.opacitybar.set_property("inverted", True)
         self.opacitybar.connect('value-changed', self.on_opacity_change)
-        opacitybox.pack_end(self.opacitybar)
+        opacitybox.pack_end(self.opacitybar, True, True, 0)
         self.opacitycheck = gtk.CheckButton(_('Sensitive'))
         self.opacitycheck.connect('toggled', self.on_variable_opacity_toggle)
         opacitybox.pack_end(self.opacitycheck, False)
@@ -262,7 +262,7 @@ class BrushControlsPanel(gtk.HBox):
         gc.line_width = old_line_width
 
     def on_palette_mouse (self, widget, event):
-        if event.state & gtk.gdk.BUTTON1_MASK:
+        if event.get_state() & gtk.gdk.BUTTON1_MASK:
             widget.grab_focus()
             self.palette.process_mouse(int(event.x), int(event.y))
             self.palettearea.queue_draw()
@@ -1768,10 +1768,10 @@ class Colors(activity.Activity, ExportedGObject):
         if self.mode == Colors.MODE_INTRO:
             context = self.easelarea.create_pango_context()
             layout = self.easelarea.create_pango_layout(_('Click anywhere to begin painting!'))
-            layout.set_font_description(pango.FontDescription('Times 14'))    
+            layout.set_font_description(Pango.FontDescription('Times 14'))    
             size = layout.get_size()
-            x = (self.width-size[0]/pango.SCALE)/2
-            y = self.height-50-size[1]/pango.SCALE
+            x = (self.width-size[0]/Pango.SCALE)/2
+            y = self.height-50-size[1]/Pango.SCALE
             self.easelarea.bin_window.draw_layout(gc, x, y, layout)
         
         self.lastr = int(self.zoom*self.easel.brush.size*self.pressure/256)
--
cgit v0.9.1