From 5b3b557d75650660aa46542bdbef45a1064e6baf Mon Sep 17 00:00:00 2001
From: Gary Martin <gary@garycmartin.com>
Date: Sun, 25 Nov 2012 17:41:31 +0000
Subject: Fix additional Gtk Enum and Flag references that have changed in GTK3

---
diff --git a/calculate.py b/calculate.py
index a88267b..66eb19f 100644
--- a/calculate.py
+++ b/calculate.py
@@ -68,8 +68,8 @@ def findchar(text, chars, ofs=0):
 
 def _textview_realize_cb(widget):
     '''Change textview properties once window is created.'''
-    win = widget.get_window(Gtk.TEXT_WINDOW_TEXT)
-    win.set_cursor(Gdk.Cursor(Gdk.HAND1))
+    win = widget.get_window(Gtk.TextWindowType.WINDOW_TEXT)
+    win.set_cursor(Gdk.Cursor(Gdk.CursorType.HAND1))
     return False
 
 class Equation:
@@ -167,7 +167,7 @@ class Equation:
         tagsmallnarrow = buf.create_tag(font=CalcLayout.FONT_SMALL_NARROW)
         tagbignarrow = buf.create_tag(font=CalcLayout.FONT_BIG_NARROW)
         tagbigger = buf.create_tag(font=CalcLayout.FONT_BIGGER)
-        tagjustright = buf.create_tag(justification=Gtk.JUSTIFY_RIGHT)
+        tagjustright = buf.create_tag(justification=Gtk.Justification.RIGHT)
         tagred = buf.create_tag(foreground='#FF0000')
 
         # Add label and equation
@@ -211,20 +211,20 @@ class Equation:
             return self.result.get_image()
 
         w = Gtk.TextView()
-        w.modify_base(Gtk.STATE_NORMAL, Gdk.color_parse(self.color.get_fill_color()))
-        w.modify_bg(Gtk.STATE_NORMAL, Gdk.color_parse(self.color.get_stroke_color()))
-        w.set_wrap_mode(Gtk.WRAP_WORD_CHAR)
-        w.set_border_window_size(Gtk.TEXT_WINDOW_LEFT, 4)
-        w.set_border_window_size(Gtk.TEXT_WINDOW_RIGHT, 4)
-        w.set_border_window_size(Gtk.TEXT_WINDOW_TOP, 4)
-        w.set_border_window_size(Gtk.TEXT_WINDOW_BOTTOM, 4)
+        w.modify_base(Gtk.StateType.NORMAL, Gdk.color_parse(self.color.get_fill_color()))
+        w.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse(self.color.get_stroke_color()))
+        w.set_wrap_mode(Gtk.WrapMode.WORD_CHAR)
+        w.set_border_window_size(Gtk.TextWindowType.LEFT, 4)
+        w.set_border_window_size(Gtk.TextWindowType.RIGHT, 4)
+        w.set_border_window_size(Gtk.TextWindowType.TOP, 4)
+        w.set_border_window_size(Gtk.TextWindowType.BOTTOM, 4)
         w.connect('realize', _textview_realize_cb)
         buf = w.get_buffer()
 
         tagsmall = buf.create_tag(font=CalcLayout.FONT_SMALL)
         tagsmallnarrow = buf.create_tag(font=CalcLayout.FONT_SMALL_NARROW)
         tagbig = buf.create_tag(font=CalcLayout.FONT_BIG,
-            justification=Gtk.JUSTIFY_RIGHT)
+            justification=Gtk.Justification.RIGHT)
         bright = (Gdk.color_parse(self.color.get_fill_color()).red_float +
                   Gdk.color_parse(self.color.get_fill_color()).green_float +
                   Gdk.color_parse(self.color.get_fill_color()).blue_float) / 3.0
@@ -524,13 +524,13 @@ class Calculate(ShareableActivity):
         if name in reserved:
             return None
         w = Gtk.TextView()
-        w.modify_base(Gtk.STATE_NORMAL, Gdk.color_parse(self.color.get_fill_color()))
-        w.modify_bg(Gtk.STATE_NORMAL, Gdk.color_parse(self.color.get_stroke_color()))
-        w.set_wrap_mode(Gtk.WRAP_WORD_CHAR)
-        w.set_border_window_size(Gtk.TEXT_WINDOW_LEFT, 4)
-        w.set_border_window_size(Gtk.TEXT_WINDOW_RIGHT, 4)
-        w.set_border_window_size(Gtk.TEXT_WINDOW_TOP, 4)
-        w.set_border_window_size(Gtk.TEXT_WINDOW_BOTTOM, 4)
+        w.modify_base(Gtk.StateType.NORMAL, Gdk.color_parse(self.color.get_fill_color()))
+        w.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse(self.color.get_stroke_color()))
+        w.set_wrap_mode(Gtk.WrapMode.WORD_CHAR)
+        w.set_border_window_size(Gtk.TextWindowType.LEFT, 4)
+        w.set_border_window_size(Gtk.TextWindowType.RIGHT, 4)
+        w.set_border_window_size(Gtk.TextWindowType.TOP, 4)
+        w.set_border_window_size(Gtk.TextWindowType.BOTTOM, 4)
         w.connect('realize', _textview_realize_cb)
         buf = w.get_buffer()
 
@@ -898,7 +898,7 @@ class Calculate(ShareableActivity):
             return ''
 
 def main():
-    win = Gtk.Window(Gtk.WINDOW_TOPLEVEL)
+    win = Gtk.Window(Gtk.WindowType.TOPLEVEL)
     t = Calculate(win)
     Gtk.main()
     return 0
--
cgit v0.9.1