try again. Got a server aborted message last time :(short-class-names-branch

7 files changed, 54 insertions, 49 deletions

diff --git a/examples/pygtk-demo/demos/buttonbox.py b/examples/pygtk-demo/demos/buttonbox.py
index 17cb55b6..130f0182 100644
--- a/examples/pygtk-demo/demos/buttonbox.py
+++ b/examples/pygtk-demo/demos/buttonbox.py
@@ -10,44 +10,44 @@ import gtk
 
 def create_bbox(horizontal=gtk.TRUE, title=None, spacing=0,
 		layout=gtk.BUTTONBOX_SPREAD):
-    frame = gtk.GtkFrame(title)
+    frame = gtk.Frame(title)
 
     if horizontal:
-	bbox = gtk.GtkHButtonBox()
+	bbox = gtk.HButtonBox()
     else:
-	bbox = gtk.GtkVButtonBox()
+	bbox = gtk.VButtonBox()
 
     bbox.set_border_width(5)
     bbox.set_layout(layout)
     bbox.set_spacing(spacing)
     frame.add(bbox)
 
-    button = gtk.GtkButton(stock='gtk-ok')
+    button = gtk.Button(stock='gtk-ok')
     bbox.add(button)
 
-    button = gtk.GtkButton(stock='gtk-cancel')
+    button = gtk.Button(stock='gtk-cancel')
     bbox.add(button)
 
-    button = gtk.GtkButton(stock='gtk-help')
+    button = gtk.Button(stock='gtk-help')
     bbox.add(button)
 
     return frame
 
 def main():
-    win = gtk.GtkWindow()
+    win = gtk.Window()
     if __name__ == '__main__':
 	win.connect('destroy', lambda win: gtk.main_quit())
 
     win.set_title('Button Boxes')
     win.set_border_width(10)
 
-    main_vbox = gtk.GtkVBox()
+    main_vbox = gtk.VBox()
     win.add(main_vbox)
     
-    frame_horiz = gtk.GtkFrame("Horizontal Button Boxes")
+    frame_horiz = gtk.Frame("Horizontal Button Boxes")
     main_vbox.pack_start(frame_horiz, padding=10)
 
-    vbox = gtk.GtkVBox()
+    vbox = gtk.VBox()
     vbox.set_border_width(10)
     frame_horiz.add(vbox)
 
@@ -60,10 +60,10 @@ def main():
     vbox.pack_start(create_bbox(gtk.TRUE, "End", 40, gtk.BUTTONBOX_END),
 		    padding=5)
 
-    frame_vert = gtk.GtkFrame("Vertical Button Boxes")
+    frame_vert = gtk.Frame("Vertical Button Boxes")
     main_vbox.pack_start(frame_vert, padding=10)
 
-    hbox = gtk.GtkHBox()
+    hbox = gtk.HBox()
     hbox.set_border_width(10)
     frame_vert.add(hbox)
 
diff --git a/examples/pygtk-demo/demos/dnd.py b/examples/pygtk-demo/demos/dnd.py
index a46cc935..ddb39414 100644
--- a/examples/pygtk-demo/demos/dnd.py
+++ b/examples/pygtk-demo/demos/dnd.py
@@ -110,12 +110,12 @@ def popup_cb():
     global popup_timer, popdown_timer
     if not popped_up:
 	if not popup_win:
-	    popup_win = gtk.GtkWindow(gtk.WINDOW_POPUP)
+	    popup_win = gtk.Window(gtk.WINDOW_POPUP)
 	    popup_win.set_position(gtk.WIN_POS_MOUSE)
-	    table = gtk.GtkTable(3, 3)
+	    table = gtk.Table(3, 3)
 	    for k in range(9):
 		i, j = divmod(k, 3)
-		b = gtk.GtkButton("%d,%d" % (i,j))
+		b = gtk.Button("%d,%d" % (i,j))
 		table.attach(b, i,i+1,j,j+1)
 		b.drag_dest_set(gtk.DEST_DEFAULT_ALL, target, 
 				gtk.GDK.ACTION_COPY | gtk.GDK.ACTION_MOVE)
@@ -142,35 +142,36 @@ def popsite_leave(w, context, time):
 def source_drag_data_delete(w, context, data):
     print 'Delete the data!'
 def create_pixmap(widget, xpm):
-    return gtk.pixmap_colormap_create_from_xpm_d(None, widget.get_colormap(),
-						None, xpm)
+    return gtk.gdk.pixmap_colormap_create_from_xpm_d(None,
+                                                     widget.get_colormap(),
+                                                     None, xpm)
 
 def main():
     global trashcan_open, trashcan_open_mask
     global trashcan_closed, trashcan_closed_mask
     global drag_icon, drag_mask
-    win = gtk.GtkWindow()
+    win = gtk.Window()
     if __name__ == '__main__':
 	win.connect('destroy', lambda win: gtk.main_quit())
-    table = gtk.GtkTable(2,2)
+    table = gtk.Table(2,2)
     win.add(table)
     drag_icon, drag_mask = create_pixmap(win, drag_icon_xpm)
     trashcan_open, trashcan_open_mask = create_pixmap(win, trashcan_open_xpm)
     trashcan_closed, trashcan_closed_mask = create_pixmap(win, trashcan_closed_xpm)
-    label = gtk.GtkLabel('Drop Here!\n')
+    label = gtk.Label('Drop Here!\n')
     label.drag_dest_set(gtk.DEST_DEFAULT_ALL, target[:-1],
 			gtk.GDK.ACTION_COPY | gtk.GDK.ACTION_MOVE)
     label.connect('drag_data_received', label_drag_data_received)
     table.attach(label, 0, 1, 0, 1)
 
-    label = gtk.GtkLabel('Popup\n')
+    label = gtk.Label('Popup\n')
     label.drag_dest_set(gtk.DEST_DEFAULT_ALL, target[:-1],
 			gtk.GDK.ACTION_COPY | gtk.GDK.ACTION_MOVE)
     table.attach(label, 1, 2, 1, 2)
     label.connect('drag_motion', popsite_motion)
     label.connect('drag_leave', popsite_leave)
 
-    pixmap = gtk.GtkPixmap(trashcan_closed, trashcan_closed_mask)
+    pixmap = gtk.Pixmap(trashcan_closed, trashcan_closed_mask)
     pixmap.drag_dest_set(0, [], 0)
     table.attach(pixmap, 1, 2, 0, 1)
     pixmap.connect('drag_leave', target_drag_leave)
@@ -178,7 +179,7 @@ def main():
     pixmap.connect('drag_drop', target_drag_drop)
     pixmap.connect('drag_data_received', target_drag_data_received)
 
-    b = gtk.GtkButton('Drag Here\n')
+    b = gtk.Button('Drag Here\n')
     b.drag_source_set(gtk.GDK.BUTTON1_MASK | gtk.GDK.BUTTON3_MASK,
 		      target, gtk.GDK.ACTION_COPY | gtk.GDK.ACTION_MOVE)
     b.drag_source_set_icon(win.get_colormap(), drag_icon, drag_mask)
diff --git a/examples/pygtk-demo/demos/menu.py b/examples/pygtk-demo/demos/menu.py
index f598f48f..98dba71c 100644
--- a/examples/pygtk-demo/demos/menu.py
+++ b/examples/pygtk-demo/demos/menu.py
@@ -12,10 +12,10 @@ import gtk
 def create_menu(depth, length=5):
     if depth < 1:
 	return None
-    menu = gtk.GtkMenu()
+    menu = gtk.Menu()
     group= None
     for i in range(length):
-	menuitem = gtk.GtkRadioMenuItem(group, 'item %2d - %d' % (depth, i))
+	menuitem = gtk.RadioMenuItem(group, 'item %2d - %d' % (depth, i))
 	group = menuitem
 	menu.add(menuitem)
 	menuitem.show()
@@ -25,46 +25,46 @@ def create_menu(depth, length=5):
     return menu
 
 def main():
-    window = gtk.GtkWindow()
+    window = gtk.Window()
     if __name__ == '__main__':
 	window.connect('destroy', lambda win: gtk.main_quit())
     window.set_title('Menus')
 
-    vbox = gtk.GtkVBox()
+    vbox = gtk.VBox()
     window.add(vbox)
 
-    menubar = gtk.GtkMenuBar()
+    menubar = gtk.MenuBar()
     vbox.pack_start(menubar, expand=gtk.FALSE)
 
-    menuitem = gtk.GtkMenuItem('test\nline2')
+    menuitem = gtk.MenuItem('test\nline2')
     menuitem.set_submenu(create_menu(2, 50))
     menubar.add(menuitem)
 
-    menuitem = gtk.GtkMenuItem('foo')
+    menuitem = gtk.MenuItem('foo')
     menuitem.set_submenu(create_menu(2))
     menubar.add(menuitem)
     
-    menuitem = gtk.GtkMenuItem('bar')
+    menuitem = gtk.MenuItem('bar')
     menuitem.set_submenu(create_menu(2))
     menuitem.right_justify()
     menubar.add(menuitem)
 
-    vbox2 = gtk.GtkVBox(spacing=10)
+    vbox2 = gtk.VBox(spacing=10)
     vbox2.set_border_width(10)
     vbox.pack_start(vbox2)
 
-    optionmenu = gtk.GtkOptionMenu()
+    optionmenu = gtk.OptionMenu()
     optionmenu.set_menu(create_menu(1,50))
     vbox2.pack_start(optionmenu)
 
-    separator = gtk.GtkHSeparator()
+    separator = gtk.HSeparator()
     vbox.pack_start(separator, expand=gtk.FALSE)
     
-    vbox2 = gtk.GtkVBox(spacing=10)
+    vbox2 = gtk.VBox(spacing=10)
     vbox2.set_border_width(10)
     vbox.pack_start(vbox2, expand=gtk.FALSE)
 
-    button = gtk.GtkButton('close')
+    button = gtk.Button('close')
     button.connect('clicked', lambda widget, window=window: window.destroy())
     vbox2.pack_start(button)
     button.set_flags(gtk.CAN_DEFAULT)
diff --git a/examples/pygtk-demo/demos/toolbar.py b/examples/pygtk-demo/demos/toolbar.py
index eb56d592..f5c6b6a7 100644
--- a/examples/pygtk-demo/demos/toolbar.py
+++ b/examples/pygtk-demo/demos/toolbar.py
@@ -43,7 +43,7 @@ def set_tooltips_cb(button, toolbar, enable):
     toolbar.set_tooltips(enable)
 
 def main():
-    win = gtk.GtkWindow()
+    win = gtk.Window()
     if __name__ == '__main__':
 	win.connect('destroy', lambda win: gtk.main_quit())
 
@@ -51,49 +51,50 @@ def main():
     win.set_policy(gtk.FALSE, gtk.TRUE, gtk.TRUE)
     win.set_border_width(5)
 
-    pix, mask = gtk.pixmap_colormap_create_from_xpm_d(None, win.get_colormap(),
-						      None, folder_icon)
+    pix, mask = gtk.gdk.pixmap_colormap_create_from_xpm_d(None,
+                                                          win.get_colormap(),
+                                                          None, folder_icon)
 
-    toolbar = gtk.GtkToolbar()
+    toolbar = gtk.Toolbar()
     win.add(toolbar)
     
     button = toolbar.append_item("Horizontal", "Horizontal toolbar layout",
-				 None, gtk.GtkPixmap(pix, mask), None, None)
+				 None, gtk.Pixmap(pix, mask), None, None)
     button.connect("clicked", set_orient_cb, toolbar,
 		   gtk.ORIENTATION_HORIZONTAL)
 
     button = toolbar.append_item("Vertical", "Vertical toolbar layout",
-				 None, gtk.GtkPixmap(pix, mask), None, None)
+				 None, gtk.Pixmap(pix, mask), None, None)
     button.connect("clicked", set_orient_cb, toolbar,
 		   gtk.ORIENTATION_VERTICAL)
 
     toolbar.append_space()
 
     button = toolbar.append_item("Icons", "Only show toolbar icons",
-				 None, gtk.GtkPixmap(pix, mask), None, None)
+				 None, gtk.Pixmap(pix, mask), None, None)
     button.connect("clicked", set_style_cb, toolbar, gtk.TOOLBAR_ICONS)
 
     button = toolbar.append_item("Text", "Only show toolbar texts",
-				 None, gtk.GtkPixmap(pix, mask), None, None)
+				 None, gtk.Pixmap(pix, mask), None, None)
     button.connect("clicked", set_style_cb, toolbar, gtk.TOOLBAR_TEXT)
 
     button = toolbar.append_item("Both", "Show toolbar icons and text",
-				 None, gtk.GtkPixmap(pix, mask), None, None)
+				 None, gtk.Pixmap(pix, mask), None, None)
     button.connect("clicked", set_style_cb, toolbar, gtk.TOOLBAR_BOTH)
 
     toolbar.append_space()
 
-    entry = gtk.GtkEntry()
+    entry = gtk.Entry()
     toolbar.append_widget(entry, None, None)
 
     toolbar.append_space()
 
     button = toolbar.append_item("Enable", "Enable tooltips",
-				 None, gtk.GtkPixmap(pix, mask), None, None)
+				 None, gtk.Pixmap(pix, mask), None, None)
     button.connect("clicked", set_tooltips_cb, toolbar, gtk.TRUE)
 
     button = toolbar.append_item("Disable", "Disable tooltips",
-				 None, gtk.GtkPixmap(pix, mask), None, None)
+				 None, gtk.Pixmap(pix, mask), None, None)
     button.connect("clicked", set_tooltips_cb, toolbar, gtk.FALSE)
 
     win.show_all()
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index b17d0fdc..05d982ec 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -52,6 +52,7 @@ $(srcdir)/gdk.c: $(srcdir)/gdk.defs $(srcdir)/gdk.override
 	cd $(srcdir) \
 	&& $(PYTHON) ../codegen/codegen.py \
 	    --register ../pango.defs \
+	    --register gtk.defs \
 	    --override gdk.override \
 	    --prefix pygdk gdk.defs > gen-gdk.c \
 	&& cp gen-gdk.c gdk.c \
diff --git a/gtk/__init__.py b/gtk/__init__.py
index 0cc71d65..8e685a37 100644
--- a/gtk/__init__.py
+++ b/gtk/__init__.py
@@ -28,7 +28,7 @@ mainiteration = main_iteration
 
 load_font = gdk.Font
 load_fontset = gdk.fontset_load
-create_pixmap = Pixmap
+create_pixmap = gdk.Pixmap
 create_pixmap_from_xpm = gdk.pixmap_create_from_xpm
 create_pixmap_from_xpm_d = gdk.pixmap_create_from_xpm_d
 
diff --git a/gtk/gdk.override b/gtk/gdk.override
index f413fa54..f05c52ac 100644
--- a/gtk/gdk.override
+++ b/gtk/gdk.override
@@ -26,6 +26,8 @@ static PyExtensionClass *_PyPangoFont_Type;
 static PyExtensionClass *_PyPangoLayout_Type;
 #define PyPangoLayout_Type (*_PyPangoLayout_Type)
 
+extern PyExtensionClass PyGtkWidget_Type;
+
 %%
 init
 {