Update example

1 files changed, 10 insertions, 22 deletions

diff --git a/examples/gtk/widget.py b/examples/gtk/widget.py
index fecfbfdc..73edb8a9 100644
--- a/examples/gtk/widget.py
+++ b/examples/gtk/widget.py
@@ -1,24 +1,12 @@
-import pygtk
-pygtk.require('2.0')
-
 import gobject
 import pango
 import gtk
 from gtk import gdk
 
-if gtk.pygtk_version < (2,3,93):
-    print "PyGtk 2.3.93 or later required for this example"
-    raise SystemExit
-
 TEXT = 'A GtkWidget implemented in PyGTK'
 BORDER_WIDTH = 10
 
 class PyGtkWidget(gtk.Widget):
-    __gsignals__ = { 'realize': 'override',
-                     'expose-event' : 'override',
-                     'size-allocate': 'override',
-                     'size-request': 'override',
-		     }
     def __init__(self):
         gtk.Widget.__init__(self)
 
@@ -28,7 +16,6 @@ class PyGtkWidget(gtk.Widget):
                                          
     def do_realize(self):
         self.set_flags(self.flags() | gtk.REALIZED)
-
         self.window = gdk.Window(self.get_parent_window(),
                                  width=self.allocation.width,
                                  height=self.allocation.height,
@@ -39,14 +26,15 @@ class PyGtkWidget(gtk.Widget):
                               line_width=5,
                               line_style=gdk.SOLID,
                               join_style=gdk.JOIN_ROUND)
-	self.window.set_user_data(self)
+        self.window.set_user_data(self)
         self.style.attach(self.window)
         self.style.set_background(self.window, gtk.STATE_NORMAL)
+        self.window.move_resize(*self.allocation)
 
     def do_size_request(self, requisition):
-	width, height = self.layout.get_size()
-	requisition.width = width // pango.SCALE + BORDER_WIDTH*4
-	requisition.height = height // pango.SCALE + BORDER_WIDTH*4
+	    width, height = self.layout.get_size()
+	    requisition.width = width // pango.SCALE + BORDER_WIDTH*4
+	    requisition.height = height // pango.SCALE + BORDER_WIDTH*4
 
     def do_size_allocate(self, allocation):
         self.allocation = allocation
@@ -54,26 +42,26 @@ class PyGtkWidget(gtk.Widget):
             self.window.move_resize(*allocation)
 
     def do_expose_event(self, event):
-        self.chain(event)
-
         x, y, w, h = self.allocation
         self.window.draw_rectangle(self.draw_gc, False,
-                                   x + BORDER_WIDTH, y + BORDER_WIDTH,
+                                   BORDER_WIDTH, BORDER_WIDTH,
                                    w - BORDER_WIDTH * 2, h - BORDER_WIDTH * 2)
         fontw, fonth = self.layout.get_pixel_size()
         self.style.paint_layout(self.window, self.state, False,
                                 event.area, self, "label",
                                 (w - fontw) / 2, (h - fonth) / 2,
                                 self.layout)
-            
 gobject.type_register(PyGtkWidget)
 
 win = gtk.Window()
 win.set_title(TEXT)
 win.connect('delete-event', gtk.main_quit)
 
+frame = gtk.Frame("Example frame")
+win.add(frame)
+
 w = PyGtkWidget()
-win.add(w)
+frame.add(w)
 
 win.show_all()