668e19c
Update some of the bitrotted parts of python-gtkextra, drop other bitrotted
668e19c
parts.
668e19c
2badc30
diff -up python-gtkextra-1.1.0/gtkextra/gtkextra-types.defs.update python-gtkextra-1.1.0/gtkextra/gtkextra-types.defs
2badc30
--- python-gtkextra-1.1.0/gtkextra/gtkextra-types.defs.update	2004-03-04 12:39:19.000000000 +0100
2badc30
+++ python-gtkextra-1.1.0/gtkextra/gtkextra-types.defs	2007-10-21 14:58:32.000000000 +0200
2badc30
@@ -27,20 +27,6 @@
2badc30
   (gtype-id "GTK_TYPE_CHECK_ITEM")
2badc30
 )
2badc30
 
2badc30
-(define-object ComboBox
2badc30
-  (in-module "Gtk")
2badc30
-  (parent "GtkHBox")
2badc30
-  (c-name "GtkComboBox")
2badc30
-  (gtype-id "GTK_TYPE_COMBO_BOX")
2badc30
-  (fields
2badc30
-    '("GtkWidget*" "button")
2badc30
-    '("GtkWidget*" "arrow")
2badc30
-    '("GtkWidget*" "popup")
2badc30
-    '("GtkWidget*" "popwin")
2badc30
-    '("GtkWidget*" "frame")
2badc30
-  )
2badc30
-)
2badc30
-
2badc30
 (define-object ColorCombo
2badc30
   (in-module "Gtk")
2badc30
   (parent "GtkComboBox")
2badc30
@@ -178,7 +164,6 @@
2badc30
     '("gboolean" "title_visible")
2badc30
     '("GtkPlotTicks" "ticks")
2badc30
     '("GtkPlotOrientation" "orientation")
2badc30
-    '("GtkPlotScale" "scale")
2badc30
     '("GtkPlotLine" "line")
2badc30
     '("GtkPlotLine" "major_grid")
2badc30
     '("GtkPlotLine" "minor_grid")
2badc30
@@ -210,16 +195,6 @@
2badc30
   (in-module "Gtk")
2badc30
   (parent "GtkWidget")
2badc30
   (c-name "GtkPlotData")
2badc30
-  (fields
2badc30
-   '("gdouble*" "x")
2badc30
-   '("gdouble*" "dx")
2badc30
-   '("gdouble*" "y")
2badc30
-   '("gdouble*" "dy")
2badc30
-   '("gdouble*" "z")
2badc30
-   '("gdouble*" "dz")
2badc30
-   '("gdouble*" "a")
2badc30
-   '("gdouble*" "da")
2badc30
-  )
2badc30
   (gtype-id "GTK_TYPE_PLOT_DATA")
2badc30
 )
2badc30
 
2badc30
@@ -381,11 +356,9 @@
2badc30
     '("gint" "min_height")
2badc30
     '("GdkRectangle" "allocation")
2badc30
     '("guint" "state")
2badc30
-    '("GtkPlotCanvasType" "type")
2badc30
     '("GtkPlotCanvasFlag" "flags")
2badc30
     '("GtkPlotCanvasSelection" "selection")
2badc30
     '("GtkPlotCanvasSelectionMode" "mode")
2badc30
-    '("gpointer" "data")
2badc30
   )
2badc30
   ;(fields
2badc30
   ;  '("gint" "data")
2badc30
@@ -549,28 +522,6 @@
2badc30
   )
2badc30
 )
2badc30
 
2badc30
-(define-enum PlotCanvasType
2badc30
-  (in-module "Gtk")
2badc30
-  (c-name "GtkPlotCanvasType")
2badc30
-  (gtype-id "GTK_TYPE_PLOT_CANVAS_TYPE")
2badc30
-  (values
2badc30
-    '("none" "GTK_PLOT_CANVAS_NONE")
2badc30
-    '("plot" "GTK_PLOT_CANVAS_PLOT")
2badc30
-    '("axis" "GTK_PLOT_CANVAS_AXIS")
2badc30
-    '("legends" "GTK_PLOT_CANVAS_LEGENDS")
2badc30
-    '("title" "GTK_PLOT_CANVAS_TITLE")
2badc30
-    '("text" "GTK_PLOT_CANVAS_TEXT")
2badc30
-    '("data" "GTK_PLOT_CANVAS_DATA")
2badc30
-    '("line" "GTK_PLOT_CANVAS_LINE")
2badc30
-    '("rectangle" "GTK_PLOT_CANVAS_RECTANGLE")
2badc30
-    '("ellipse" "GTK_PLOT_CANVAS_ELLIPSE")
2badc30
-    '("pixmap" "GTK_PLOT_CANVAS_PIXMAP")
2badc30
-    '("marker" "GTK_PLOT_CANVAS_MARKER")
2badc30
-    '("polygon" "GTK_PLOT_CANVAS_POLYGON")
2badc30
-    '("custom" "GTK_PLOT_CANVAS_CUSTOM")
2badc30
-  )
2badc30
-)
2badc30
-
2badc30
 (define-enum PlotCanvasPos
2badc30
   (in-module "Gtk")
2badc30
   (c-name "GtkPlotCanvasPos")
2badc30
diff -up python-gtkextra-1.1.0/gtkextra/gtkextra.defs.update python-gtkextra-1.1.0/gtkextra/gtkextra.defs
2badc30
--- python-gtkextra-1.1.0/gtkextra/gtkextra.defs.update	2003-07-02 18:25:07.000000000 +0200
2badc30
+++ python-gtkextra-1.1.0/gtkextra/gtkextra.defs	2007-10-21 14:41:24.000000000 +0200
2badc30
@@ -152,12 +152,6 @@
2badc30
   (return-type "GtkWidget*")
2badc30
 )
2badc30
 
2badc30
-(define-method hide_popdown_window
2badc30
-  (of-object "GtkComboBox")
2badc30
-  (c-name "gtk_combobox_hide_popdown_window")
2badc30
-  (return-type "none")
2badc30
-)
2badc30
-
2badc30
 (define-function gtk_dir_tree_get_type
2badc30
   (c-name "gtk_dir_tree_get_type")
2badc30
   (return-type "GtkType")
2badc30
@@ -1276,7 +1270,7 @@
2badc30
 
2badc30
 (define-method axis_show_major_ticks
2badc30
   (of-object "GtkPlot3D")
2badc30
-  (c-name "gtk_plot3d_axis_show_major_ticks")
2badc30
+  (c-name "gtk_plot3d_show_major_ticks")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
     '("GtkPlotSide" "side")
2badc30
@@ -1286,7 +1280,7 @@
2badc30
 
2badc30
 (define-method axis_show_minor_ticks
2badc30
   (of-object "GtkPlot3D")
2badc30
-  (c-name "gtk_plot3d_axis_show_minor_ticks")
2badc30
+  (c-name "gtk_plot3d_show_minor_ticks")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
     '("GtkPlotSide" "side")
2badc30
@@ -1296,7 +1290,7 @@
2badc30
 
2badc30
 (define-method axis_show_labels
2badc30
   (of-object "GtkPlot3D")
2badc30
-  (c-name "gtk_plot3d_axis_show_labels")
2badc30
+  (c-name "gtk_plot3d_show_labels")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
     '("GtkPlotSide" "side")
2badc30
@@ -1306,7 +1300,7 @@
2badc30
 
2badc30
 (define-method axis_show_title
2badc30
   (of-object "GtkPlot3D")
2badc30
-  (c-name "gtk_plot3d_axis_show_title")
2badc30
+  (c-name "gtk_plot3d_show_title")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
     '("GtkPlotSide" "side")
2badc30
@@ -1315,7 +1309,7 @@
2badc30
 
2badc30
 (define-method axis_hide_title
2badc30
   (of-object "GtkPlot3D")
2badc30
-  (c-name "gtk_plot3d_axis_hide_title")
2badc30
+  (c-name "gtk_plot3d_hide_title")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
     '("GtkPlotSide" "side")
2badc30
@@ -1324,7 +1318,7 @@
2badc30
 
2badc30
 (define-method axis_set_ticks
2badc30
   (of-object "GtkPlot3D")
2badc30
-  (c-name "gtk_plot3d_axis_set_ticks")
2badc30
+  (c-name "gtk_plot3d_set_ticks")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
     '("GtkPlotOrientation" "axis")
2badc30
@@ -1335,7 +1329,7 @@
2badc30
 
2badc30
 (define-method axis_set_major_ticks
2badc30
   (of-object "GtkPlot3D")
2badc30
-  (c-name "gtk_plot3d_axis_set_major_ticks")
2badc30
+  (c-name "gtk_plot3d_set_major_ticks")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
     '("GtkPlotOrientation" "axis")
2badc30
@@ -1345,7 +1339,7 @@
2badc30
 
2badc30
 (define-method axis_set_minor_ticks
2badc30
   (of-object "GtkPlot3D")
2badc30
-  (c-name "gtk_plot3d_axis_set_minor_ticks")
2badc30
+  (c-name "gtk_plot3d_set_minor_ticks")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
     '("GtkPlotOrientation" "axis")
2badc30
@@ -1355,7 +1349,7 @@
2badc30
 
2badc30
 (define-method axis_set_ticks_length
2badc30
   (of-object "GtkPlot3D")
2badc30
-  (c-name "gtk_plot3d_axis_set_ticks_length")
2badc30
+  (c-name "gtk_plot3d_set_ticks_length")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
     '("GtkPlotOrientation" "axis")
2badc30
@@ -1365,7 +1359,7 @@
2badc30
 
2badc30
 (define-method axis_set_ticks_width
2badc30
   (of-object "GtkPlot3D")
2badc30
-  (c-name "gtk_plot3d_axis_set_ticks_width")
2badc30
+  (c-name "gtk_plot3d_set_ticks_width")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
     '("GtkPlotOrientation" "axis")
2badc30
@@ -1375,7 +1369,7 @@
2badc30
 
2badc30
 (define-method axis_show_ticks
2badc30
   (of-object "GtkPlot3D")
2badc30
-  (c-name "gtk_plot3d_axis_show_ticks")
2badc30
+  (c-name "gtk_plot3d_show_ticks")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
     '("GtkPlotSide" "side")
2badc30
@@ -1401,7 +1395,7 @@
2badc30
 
2badc30
 (define-method axis_set_scale
2badc30
   (of-object "GtkPlot3D")
2badc30
-  (c-name "gtk_plot3d_axis_set_scale")
2badc30
+  (c-name "gtk_plot3d_set_scale")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
     '("GtkPlotAxisPos" "axis")
2badc30
@@ -1411,7 +1405,7 @@
2badc30
 
2badc30
 (define-method axis_get_scale
2badc30
   (of-object "GtkPlot3D")
2badc30
-  (c-name "gtk_plot3d_axis_get_scale")
2badc30
+  (c-name "gtk_plot3d_get_scale")
2badc30
   (return-type "GtkPlotScale")
2badc30
   (parameters
2badc30
     '("GtkPlotAxisPos" "axis")
2badc30
@@ -1672,26 +1666,6 @@
2badc30
   )
2badc30
 )
2badc30
 
2badc30
-(define-method add_plot
2badc30
-  (of-object "GtkPlotCanvas")
2badc30
-  (c-name "gtk_plot_canvas_add_plot")
2badc30
-  (return-type "none")
2badc30
-  (parameters
2badc30
-    '("GtkPlot*" "plot")
2badc30
-    '("gdouble" "x")
2badc30
-    '("gdouble" "y")
2badc30
-  )
2badc30
-)
2badc30
-
2badc30
-(define-method set_active_plot
2badc30
-  (of-object "GtkPlotCanvas")
2badc30
-  (c-name "gtk_plot_canvas_set_active_plot")
2badc30
-  (return-type "none")
2badc30
-  (parameters
2badc30
-    '("GtkPlot*" "plot")
2badc30
-  )
2badc30
-)
2badc30
-
2badc30
 (define-method cancel_action
2badc30
   (of-object "GtkPlotCanvas")
2badc30
   (c-name "gtk_plot_canvas_cancel_action")
2badc30
@@ -1704,28 +1678,6 @@
2badc30
   (return-type "none")
2badc30
 )
2badc30
 
2badc30
-(define-method get_active_plot
2badc30
-  (of-object "GtkPlotCanvas")
2badc30
-  (c-name "gtk_plot_canvas_get_active_plot")
2badc30
-  (return-type "GtkPlot*" (null-ok))
2badc30
-)
2badc30
-
2badc30
-(define-method get_active_data
2badc30
-  (of-object "GtkPlotCanvas")
2badc30
-  (c-name "gtk_plot_canvas_get_active_data")
2badc30
-  (return-type "GtkPlotData*" (null-ok))
2badc30
-)
2badc30
-
2badc30
-(define-method get_active_point
2badc30
-  (of-object "GtkPlotCanvas")
2badc30
-  (c-name "gtk_plot_canvas_get_active_point")
2badc30
-  (return-type "gint")
2badc30
-  (parameters
2badc30
-    '("gdouble*" "x")
2badc30
-    '("gdouble*" "y")
2badc30
-  )
2badc30
-)
2badc30
-
2badc30
 (define-method get_active_item
2badc30
   (of-object "GtkPlotCanvas")
2badc30
   (c-name "gtk_plot_canvas_get_active_item")
2badc30
@@ -1799,110 +1751,15 @@
2badc30
   )
2badc30
 )
2badc30
 
2badc30
-(define-method put_text
2badc30
-  (of-object "GtkPlotCanvas")
2badc30
-  (c-name "gtk_plot_canvas_put_text")
2badc30
-  (return-type "GtkPlotCanvasChild*" (null-ok))
2badc30
-  (parameters
2badc30
-    '("gdouble" "x")
2badc30
-    '("gdouble" "y")
2badc30
-    '("const-gchar*" "font" (default "NULL") (null-ok))
2badc30
-    '("gint" "height")
2badc30
-    '("gint" "angle")
2badc30
-    '("const-GdkColor*" "fg" (default "NULL") (null-ok))
2badc30
-    '("const-GdkColor*" "bg" (default "NULL") (null-ok))
2badc30
-    '("gboolean" "transparent")
2badc30
-    '("GtkJustification" "justification")
2badc30
-    '("const-gchar*" "text")
2badc30
-  )
2badc30
-)
2badc30
-
2badc30
 (define-method remove_child
2badc30
   (of-object "GtkPlotCanvas")
2badc30
   (c-name "gtk_plot_canvas_remove_child")
2badc30
-  (return-type "gboolean")
2badc30
+  (return-type "none")
2badc30
   (parameters
2badc30
     '("GtkPlotCanvasChild*" "child")
2badc30
   )
2badc30
 )
2badc30
 
2badc30
-(define-method put_line
2badc30
-  (of-object "GtkPlotCanvas")
2badc30
-  (c-name "gtk_plot_canvas_put_line")
2badc30
-  (return-type "GtkPlotCanvasChild*" (null-ok))
2badc30
-  (parameters
2badc30
-    '("gdouble" "x1")
2badc30
-    '("gdouble" "y1")
2badc30
-    '("gdouble" "x2")
2badc30
-    '("gdouble" "y2")
2badc30
-    '("GtkPlotLineStyle" "style" (default "GTK_PLOT_LINE_SOLID"))
2badc30
-    '("gfloat" "width" (default "1.0"))
2badc30
-    '("const-GdkColor*" "color" (default "NULL") (null-ok))
2badc30
-    '("GtkPlotCanvasArrow" "arrow_mask" (default "GTK_PLOT_ARROW_NONE"))
2badc30
-  )
2badc30
-)
2badc30
-
2badc30
-(define-method put_rectangle
2badc30
-  (of-object "GtkPlotCanvas")
2badc30
-  (c-name "gtk_plot_canvas_put_rectangle")
2badc30
-  (return-type "GtkPlotCanvasChild*" (null-ok))
2badc30
-  (parameters
2badc30
-    '("gdouble" "x1")
2badc30
-    '("gdouble" "y1")
2badc30
-    '("gdouble" "x2")
2badc30
-    '("gdouble" "y2")
2badc30
-    '("GtkPlotLineStyle" "style" (default "GTK_PLOT_LINE_SOLID"))
2badc30
-    '("gfloat" "width" (default "1.0"))
2badc30
-    '("const-GdkColor*" "fg" (default "NULL") (null-ok))
2badc30
-    '("const-GdkColor*" "bg" (default "NULL") (null-ok))
2badc30
-    '("GtkPlotBorderStyle" "border" (default "GTK_PLOT_BORDER_LINE"))
2badc30
-    '("gboolean" "fill" (default "TRUE"))
2badc30
-  )
2badc30
-)
2badc30
-
2badc30
-(define-method put_ellipse
2badc30
-  (of-object "GtkPlotCanvas")
2badc30
-  (c-name "gtk_plot_canvas_put_ellipse")
2badc30
-  (return-type "GtkPlotCanvasChild*" (null-ok))
2badc30
-  (parameters
2badc30
-    '("gdouble" "x1")
2badc30
-    '("gdouble" "y1")
2badc30
-    '("gdouble" "x2")
2badc30
-    '("gdouble" "y2")
2badc30
-    '("GtkPlotLineStyle" "style" (default "GTK_PLOT_LINE_SOLID"))
2badc30
-    '("gfloat" "width" (default "1.0"))
2badc30
-    '("const-GdkColor*" "fg" (default "NULL") (null-ok))
2badc30
-    '("const-GdkColor*" "bg" (default "NULL") (null-ok))
2badc30
-    '("gboolean" "fill" (default "TRUE"))
2badc30
-  )
2badc30
-)
2badc30
-
2badc30
-(define-method put_polygon
2badc30
-  (of-object "GtkPlotCanvas")
2badc30
-  (c-name "gtk_plot_canvas_put_polygon_PY")
2badc30
-  (return-type "GtkPlotCanvasChild*")
2badc30
-  (parameters
2badc30
-    '("GtkPlotPoint*" "points")
2badc30
-    '("guint" "npoints")
2badc30
-    '("GtkPlotLineStyle" "style" (default "GTK_PLOT_LINE_SOLID"))
2badc30
-    '("gfloat" "width" (default "1.0"))
2badc30
-    '("const-GdkColor*" "fg" (default "NULL") (null-ok))
2badc30
-    '("const-GdkColor*" "bg" (default "NULL") (null-ok))
2badc30
-    '("gboolean" "fill" (default "TRUE"))
2badc30
-  )
2badc30
-)
2badc30
-
2badc30
-(define-method put_pixmap
2badc30
-  (of-object "GtkPlotCanvas")
2badc30
-  (c-name "gtk_plot_canvas_put_pixmap")
2badc30
-  (return-type "GtkPlotCanvasChild*" (null-ok))
2badc30
-  (parameters
2badc30
-    '("GdkPixmap*" "pixmap")
2badc30
-    '("gdouble" "x1")
2badc30
-    '("gdouble" "y1")
2badc30
-  )
2badc30
-)
2badc30
-
2badc30
 ;(define-function gtk_plot_canvas_line_set_attributes
2badc30
 ;  (c-name "gtk_plot_canvas_line_set_attributes")
2badc30
 ;  (return-type "none")
2badc30
@@ -1915,18 +1772,6 @@
2badc30
 ;  )
2badc30
 ;)
2badc30
 
2badc30
-(define-method line_set_attributes
2badc30
-  (of-object "GtkPlotCanvasChild")
2badc30
-  (c-name "gtk_plot_canvas_line_set_attributes")
2badc30
-  (return-type "none")
2badc30
-  (parameters
2badc30
-    '("GtkPlotLineStyle" "style")
2badc30
-    '("gfloat" "width")
2badc30
-    '("const-GdkColor*" "color" (null-ok))
2badc30
-    '("GtkPlotCanvasArrow" "mask")
2badc30
-  )
2badc30
-)
2badc30
-
2badc30
 ;(define-function gtk_plot_canvas_rectangle_set_attributes
2badc30
 ;  (c-name "gtk_plot_canvas_rectangle_set_attributes")
2badc30
 ;  (return-type "none")
2badc30
@@ -1941,20 +1786,6 @@
2badc30
 ;  )
2badc30
 ;)
2badc30
 
2badc30
-(define-method rectangle_set_attributes
2badc30
-  (of-object "GtkPlotCanvasChild")
2badc30
-  (c-name "gtk_plot_canvas_rectangle_set_attributes")
2badc30
-  (return-type "none")
2badc30
-  (parameters
2badc30
-    '("GtkPlotLineStyle" "style" (default "GTK_PLOT_LINE_SOLID"))
2badc30
-    '("gfloat" "width" (default "1.0"))
2badc30
-    '("const-GdkColor*" "fg" (default "NULL") (null-ok))
2badc30
-    '("const-GdkColor*" "bg" (default "NULL") (null-ok))
2badc30
-    '("GtkPlotBorderStyle" "border" (default "GTK_PLOT_BORDER_LINE"))
2badc30
-    '("gboolean" "fill" (default "FALSE"))
2badc30
-  )
2badc30
-)
2badc30
-
2badc30
 ;(define-function gtk_plot_canvas_ellipse_set_attributes
2badc30
 ;  (c-name "gtk_plot_canvas_ellipse_set_attributes")
2badc30
 ;  (return-type "none")
2badc30
@@ -1968,19 +1799,6 @@
2badc30
 ;  )
2badc30
 ;)
2badc30
 
2badc30
-(define-method ellipse_set_attributes
2badc30
-  (of-object "GtkPlotCanvasChild")
2badc30
-  (c-name "gtk_plot_canvas_ellipse_set_attributes")
2badc30
-  (return-type "none")
2badc30
-  (parameters
2badc30
-    '("GtkPlotLineStyle" "style")
2badc30
-    '("gfloat" "width")
2badc30
-    '("const-GdkColor*" "fg" (null-ok))
2badc30
-    '("const-GdkColor*" "bg" (null-ok))
2badc30
-    '("gboolean" "fill")
2badc30
-  )
2badc30
-)
2badc30
-
2badc30
 ;(define-function gtk_plot_canvas_polygon_set_attributes
2badc30
 ;  (c-name "gtk_plot_canvas_polygon_set_attributes")
2badc30
 ;  (return-type "none")
2badc30
@@ -1994,19 +1812,6 @@
2badc30
 ;  )
2badc30
 ;)
2badc30
 
2badc30
-(define-method polygon_set_attributes
2badc30
-  (of-object "GtkPlotCanvasChild")
2badc30
-  (c-name "gtk_plot_canvas_polygon_set_attributes")
2badc30
-  (return-type "none")
2badc30
-  (parameters
2badc30
-    '("GtkPlotLineStyle" "style")
2badc30
-    '("gfloat" "width")
2badc30
-    '("const-GdkColor*" "fg" (null-ok))
2badc30
-    '("const-GdkColor*" "bg" (null-ok))
2badc30
-    '("gboolean" "fill")
2badc30
-  )
2badc30
-)
2badc30
-
2badc30
 (define-function gtk_plot_canvas_child_new
2badc30
   (is-constructor-of "GtkPlotCanvasChild")
2badc30
   (c-name "gtk_plot_canvas_child_new")
2badc30
@@ -2777,16 +2582,6 @@
2badc30
   (return-type "gboolean")
2badc30
 )
2badc30
 
2badc30
-(define-method draw_gradient
2badc30
-  (of-object "GtkPlotData")
2badc30
-  (c-name "gtk_plot_data_draw_gradient")
2badc30
-  (return-type "none")
2badc30
-  (parameters
2badc30
-    '("gint" "x")
2badc30
-    '("gint" "y")
2badc30
-  )
2badc30
-)
2badc30
-
2badc30
 (define-method gradient_autoscale_a
2badc30
   (of-object "GtkPlotData")
2badc30
   (c-name "gtk_plot_data_gradient_autoscale_a")
2badc30
@@ -3097,7 +2892,7 @@
2badc30
   (c-name "gtk_plot_gdk_new")
2badc30
   (return-type "GtkObject*")
2badc30
   (parameters
2badc30
-    '("GdkDrawable*" "drawable")
2badc30
+    '("GtkWidget*" "widget")
2badc30
   )
2badc30
 )
2badc30
 
2badc30
@@ -3106,7 +2901,7 @@
2badc30
   (c-name "gtk_plot_gdk_construct")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
-    '("GdkDrawable*" "drawable")
2badc30
+    '("GtkWidget*" "widget")
2badc30
   )
2badc30
 )
2badc30
 
2badc30
@@ -3594,58 +3389,46 @@
2badc30
 )
2badc30
 
2badc30
 (define-method axis_set_visible
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_set_visible")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
-    '("GtkPlotAxisPos" "axis")
2badc30
     '("gboolean" "visible")
2badc30
   )
2badc30
 )
2badc30
 
2badc30
 (define-method axis_visible
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_visible")
2badc30
   (return-type "gboolean")
2badc30
-  (parameters
2badc30
-    '("GtkPlotAxisPos" "axis")
2badc30
-  )
2badc30
 )
2badc30
 
2badc30
 (define-method axis_set_title
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_set_title")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
-    '("GtkPlotAxisPos" "axis")
2badc30
     '("const-gchar*" "title")
2badc30
   )
2badc30
 )
2badc30
 
2badc30
 (define-method axis_show_title
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_show_title")
2badc30
   (return-type "none")
2badc30
-  (parameters
2badc30
-    '("GtkPlotAxisPos" "axis")
2badc30
-  )
2badc30
 )
2badc30
 
2badc30
 (define-method axis_hide_title
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_hide_title")
2badc30
   (return-type "none")
2badc30
-  (parameters
2badc30
-    '("GtkPlotAxisPos" "axis")
2badc30
-  )
2badc30
 )
2badc30
 
2badc30
 (define-method axis_move_title
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_move_title")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
-    '("GtkPlotAxisPos" "axis")
2badc30
     '("gint" "angle")
2badc30
     '("gdouble" "x")
2badc30
     '("gdouble" "y")
2badc30
@@ -3653,125 +3436,111 @@
2badc30
 )
2badc30
 
2badc30
 (define-method axis_justify_title
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_justify_title")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
-    '("GtkPlotAxisPos" "axis")
2badc30
     '("GtkJustification" "justification")
2badc30
   )
2badc30
 )
2badc30
 
2badc30
 (define-method axis_set_attributes
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_set_attributes")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
-    '("GtkPlotAxisPos" "axis")
2badc30
     '("gfloat" "width")
2badc30
     '("const-GdkColor*" "color")
2badc30
   )
2badc30
 )
2badc30
 
2badc30
 (define-method axis_get_attributes
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_get_attributes")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
-    '("GtkPlotAxisPos" "axis")
2badc30
     '("gfloat*" "width")
2badc30
     '("GdkColor*" "color")
2badc30
   )
2badc30
 )
2badc30
 
2badc30
 (define-method axis_set_ticks
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_set_ticks")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
-    '("GtkPlotOrientation" "orientation")
2badc30
     '("gdouble" "major_step")
2badc30
     '("gint" "nminor")
2badc30
   )
2badc30
 )
2badc30
 
2badc30
 (define-method axis_set_major_ticks
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_set_major_ticks")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
-    '("GtkPlotOrientation" "orientation")
2badc30
     '("gdouble" "major_step")
2badc30
   )
2badc30
 )
2badc30
 
2badc30
 (define-method axis_set_minor_ticks
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_set_minor_ticks")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
-    '("GtkPlotOrientation" "orientation")
2badc30
     '("gint" "nminor")
2badc30
   )
2badc30
 )
2badc30
 
2badc30
 (define-method axis_set_ticks_length
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_set_ticks_length")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
-    '("GtkPlotAxisPos" "axis")
2badc30
     '("gint" "length")
2badc30
   )
2badc30
 )
2badc30
 
2badc30
 (define-method axis_set_ticks_width
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_set_ticks_width")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
-    '("GtkPlotAxisPos" "axis")
2badc30
     '("gfloat" "width")
2badc30
   )
2badc30
 )
2badc30
 
2badc30
 (define-method axis_show_ticks
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_show_ticks")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
-    '("GtkPlotAxisPos" "axis")
2badc30
     '("gint" "major_mask")
2badc30
     '("gint" "minor_mask")
2badc30
   )
2badc30
 )
2badc30
 
2badc30
 (define-method axis_set_ticks_limits
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_set_ticks_limits")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
-    '("GtkPlotOrientation" "orientation")
2badc30
     '("gdouble" "begin")
2badc30
     '("gdouble" "end")
2badc30
   )
2badc30
 )
2badc30
 
2badc30
 (define-method axis_unset_ticks_limits
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_unset_ticks_limits")
2badc30
   (return-type "none")
2badc30
-  (parameters
2badc30
-    '("GtkPlotOrientation" "orientation")
2badc30
-  )
2badc30
 )
2badc30
 
2badc30
 (define-method axis_set_break
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_set_break")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
-    '("GtkPlotOrientation" "orient")
2badc30
     '("gdouble" "min")
2badc30
     '("gdouble" "max")
2badc30
     '("gdouble" "step_after")
2badc30
@@ -3782,30 +3551,25 @@
2badc30
 )
2badc30
 
2badc30
 (define-method axis_remove_break
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_remove_break")
2badc30
   (return-type "none")
2badc30
-  (parameters
2badc30
-    '("GtkPlotOrientation" "orient")
2badc30
-  )
2badc30
 )
2badc30
 
2badc30
 (define-method axis_show_labels
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_show_labels")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
-    '("GtkPlotAxisPos" "axis")
2badc30
     '("gint" "labels_mask")
2badc30
   )
2badc30
 )
2badc30
 
2badc30
 (define-method axis_title_set_attributes
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_title_set_attributes")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
-    '("GtkPlotAxisPos" "axis")
2badc30
     '("const-gchar*" "font")
2badc30
     '("gint" "height")
2badc30
     '("gint" "angle")
2badc30
@@ -3817,11 +3581,10 @@
2badc30
 )
2badc30
 
2badc30
 (define-method axis_set_labels_attributes
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_set_labels_attributes")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
-    '("GtkPlotAxisPos" "axis")
2badc30
     '("const-gchar*" "font")
2badc30
     '("gint" "height")
2badc30
     '("gint" "angle")
2badc30
@@ -3833,81 +3596,67 @@
2badc30
 )
2badc30
 
2badc30
 (define-method axis_set_labels_style
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_set_labels_style")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
-    '("GtkPlotAxisPos" "axis")
2badc30
     '("gint" "style")
2badc30
     '("gint" "precision")
2badc30
   )
2badc30
 )
2badc30
 
2badc30
 (define-method axis_set_labels_offset
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_set_labels_offset")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
-    '("GtkPlotAxisPos" "axis")
2badc30
     '("gint" "offset")
2badc30
   )
2badc30
 )
2badc30
 
2badc30
 (define-method axis_get_labels_offset
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_get_labels_offset")
2badc30
   (return-type "gint")
2badc30
-  (parameters
2badc30
-    '("GtkPlotAxisPos" "axis")
2badc30
-  )
2badc30
 )
2badc30
 
2badc30
 (define-method axis_use_custom_tick_labels
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_use_custom_tick_labels")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
-    '("GtkPlotAxisPos" "axispos")
2badc30
     '("gboolean" "use")
2badc30
   )
2badc30
 )
2badc30
 
2badc30
 (define-method axis_set_labels_suffix
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_set_labels_suffix")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
-    '("GtkPlotAxisPos" "axis")
2badc30
     '("const-gchar*" "text")
2badc30
   )
2badc30
 )
2badc30
 
2badc30
 (define-method axis_set_labels_prefix
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_set_labels_prefix")
2badc30
   (return-type "none")
2badc30
   (parameters
2badc30
-    '("GtkPlotAxisPos" "axis")
2badc30
     '("const-gchar*" "text")
2badc30
   )
2badc30
 )
2badc30
 
2badc30
 (define-method axis_get_labels_suffix
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_get_labels_suffix")
2badc30
   (return-type "gchar*" (null-ok))
2badc30
-  (parameters
2badc30
-    '("GtkPlotAxisPos" "axis")
2badc30
-  )
2badc30
 )
2badc30
 
2badc30
 (define-method axis_get_labels_prefix
2badc30
-  (of-object "GtkPlot")
2badc30
+  (of-object "GtkPlotAxis")
2badc30
   (c-name "gtk_plot_axis_get_labels_prefix")
2badc30
   (return-type "gchar*" (null-ok))
2badc30
-  (parameters
2badc30
-    '("GtkPlotAxisPos" "axis")
2badc30
-  )
2badc30
 )
2badc30
 
2badc30
 (define-method x0_set_visible
2badc30
diff -up python-gtkextra-1.1.0/gtkextra/mycodegen.py.update python-gtkextra-1.1.0/gtkextra/mycodegen.py
2badc30
--- python-gtkextra-1.1.0/gtkextra/mycodegen.py.update	2002-12-30 21:42:13.000000000 +0100
2badc30
+++ python-gtkextra-1.1.0/gtkextra/mycodegen.py	2007-10-21 14:41:24.000000000 +0200
2badc30
@@ -13,5 +13,5 @@ import codegen.codegen
2badc30
 
2badc30
 matcher.register('GdkWChar', matcher.get('gint32'))
2badc30
 
2badc30
-codegen.codegen.main()
2badc30
+codegen.codegen.main(sys.argv)
2badc30
 
2badc30
diff -up python-gtkextra-1.1.0/gtkextra/gtkextramodule.c.update python-gtkextra-1.1.0/gtkextra/gtkextramodule.c
2badc30
--- python-gtkextra-1.1.0/gtkextra/gtkextramodule.c.update	2003-01-15 19:57:08.000000000 +0100
2badc30
+++ python-gtkextra-1.1.0/gtkextra/gtkextramodule.c	2007-10-21 14:41:24.000000000 +0200
2badc30
@@ -57,6 +57,11 @@ init_gtkextra(void)
2badc30
     _ADD_CONST(PLOT_DATA_DA);
2badc30
     _ADD_CONST(PLOT_DATA_LABELS);
2badc30
 
2badc30
+    _ADD_CONST(SHEET_LEFT_BORDER);
2badc30
+    _ADD_CONST(SHEET_RIGHT_BORDER);
2badc30
+    _ADD_CONST(SHEET_TOP_BORDER);
2badc30
+    _ADD_CONST(SHEET_BOTTOM_BORDER);
2badc30
+
2badc30
 #undef _ADD_CONST
2badc30
 
2badc30
     gtk_psfont_init();
2badc30
diff -up python-gtkextra-1.1.0/gtkextra/gtkextra.override.update python-gtkextra-1.1.0/gtkextra/gtkextra.override
2badc30
--- python-gtkextra-1.1.0/gtkextra/gtkextra.override.update	2004-03-09 12:43:15.000000000 +0100
2badc30
+++ python-gtkextra-1.1.0/gtkextra/gtkextra.override	2007-10-21 14:57:05.000000000 +0200
2badc30
@@ -41,37 +41,11 @@ static gchar * pygtkextra_keys[] = {
2badc30
     "x", "y", "z", "a", "dx", "dy", "dz", "da"
2badc30
 };
2badc30
 
2badc30
-/*
2badc30
-  This exists in pygtk/gtk/gtk-types.c.  It is not static there, but 
2badc30
-  is exported for our use.  Especially since dlopen is now not done
2badc30
-  with RTLD_GLOBAL flags by default. Might wish to ask James if it
2badc30
-  could be published or if there is another way.
2badc30
-*/
2badc30
-
2badc30
-static gboolean
2badc30
-pygdk_rectangle_from_pyobject(PyObject *object, GdkRectangle *rectangle)
2badc30
-{
2badc30
-    g_return_val_if_fail(rectangle != NULL, FALSE);
2badc30
-
2badc30
-    if (pyg_boxed_check(object, GDK_TYPE_RECTANGLE)) {
2badc30
-	*rectangle = *pyg_boxed_get(object, GdkRectangle);
2badc30
-	return TRUE;
2badc30
-    }
2badc30
-    if (PyArg_ParseTuple(object, "iiii", &rectangle->x, &rectangle->y,
2badc30
-			 &rectangle->width, &rectangle->height)) {
2badc30
-	return TRUE;
2badc30
-    }
2badc30
-    PyErr_Clear();
2badc30
-    PyErr_SetString(PyExc_TypeError, "could not convert to GdkRectangle");
2badc30
-    return FALSE;
2badc30
-}
2badc30
-
2badc30
 /* ----------------------------------------------------------------------
2badc30
  Fixup boo-boo's or ommissions.  Probably should be fixed in gtkextra.
2badc30
 */
2badc30
 #define GTK_ICON_FILE_SEL GTK_ICON_FILESEL
2badc30
 #define GTK_TYPE_ICON_FILE_SEL (gtk_icon_file_selection_get_type())
2badc30
-#define GTK_TYPE_COMBO_BOX (gtk_combobox_get_type())
2badc30
 #define GTK_TYPE_COLOR_COMBO (gtk_color_combo_get_type())
2badc30
 #define GTK_TYPE_BORDER_COMBO (gtk_border_combo_get_type())
2badc30
 #define GTK_TYPE_FONT_COMBO (gtk_font_combo_get_type())
2badc30
@@ -639,7 +613,7 @@ import gtk._gtk.Window as PyGtkWindow_Ty
2badc30
 import gtk._gtk.CTree as PyGtkCTree_Type
2badc30
 import gtk._gtk.ToggleButton as PyGtkToggleButton_Type
2badc30
 import gtk._gtk.Adjustment as PyGtkAdjustment_Type
2badc30
-import gtk._gtk.HBox as PyGtkHBox_Type
2badc30
+import gtk._gtk.ComboBox as PyGtkComboBox_Type
2badc30
 %%
2badc30
 override gtk_psfont_get_char_size
2badc30
 static PyObject *
2badc30
@@ -979,46 +953,6 @@ _wrap_gtk_plot_data__set_da(PyGObject *s
2badc30
     return pygtkextra_plot_data_set(self, value, "da", gtk_plot_data_set_da);
2badc30
 }
2badc30
 %%
2badc30
-override gtk_plot_data_get_point
2badc30
-static PyObject *
2badc30
-_wrap_gtk_plot_data_get_point(PyGObject *self, PyObject *args)
2badc30
-{
2badc30
-    PyObject *py_ret;
2badc30
-    gint n;
2badc30
-    gdouble x, y, z, a, dx, dy, dz, da;
2badc30
-    gchar *label;
2badc30
-    gboolean error;
2badc30
-    GtkPlotData *plot_data = GTK_PLOT_DATA(self->obj);
2badc30
-
2badc30
-    if (!PyArg_ParseTuple(args, "i:PlotData.get_point", &n)) {
2badc30
-	return NULL;
2badc30
-    }
2badc30
-    
2badc30
-    gtk_plot_data_get_point(plot_data, n, &x, &y, &z, &a, &dx, &dy, &dz, &da, &label, &error);
2badc30
- 
2badc30
-    if (error) {
2badc30
-	PyErr_SetString(PyExc_RuntimeError, "gtk_plot_data_get_point() returned an error");
2badc30
-	return NULL;
2badc30
-    }
2badc30
-
2badc30
-    if (! (py_ret = PyDict_New()) )
2badc30
-	return NULL;
2badc30
-
2badc30
-    if ( (plot_data -> x && pygtkextra_dict_set_item_double(py_ret, "x", x))
2badc30
-	 || (plot_data -> y && pygtkextra_dict_set_item_double(py_ret, "y", y))
2badc30
-	 || (plot_data -> z && pygtkextra_dict_set_item_double(py_ret, "z", z))
2badc30
-	 || (plot_data -> a && pygtkextra_dict_set_item_double(py_ret, "a", a))
2badc30
-	 || (plot_data -> dx && pygtkextra_dict_set_item_double(py_ret, "dx", dx))
2badc30
-	 || (plot_data -> dy && pygtkextra_dict_set_item_double(py_ret, "dy", dy))
2badc30
-	 || (plot_data -> dz && pygtkextra_dict_set_item_double(py_ret, "dz", dz))
2badc30
-	 || (plot_data -> da && pygtkextra_dict_set_item_double(py_ret, "da", da))
2badc30
-	 || (plot_data -> labels && pygtkextra_dict_set_item_string(py_ret, "label", label)) ) {
2badc30
-	Py_DECREF(py_ret);
2badc30
-	return NULL;
2badc30
-    }
2badc30
-    return py_ret;
2badc30
-}
2badc30
-%%
2badc30
 override gtk_plot_data_set_labels kwargs
2badc30
 PyObject *
2badc30
 _wrap_gtk_plot_data_set_labels(PyGObject *self, PyObject *args, PyObject *kwargs)
2badc30
@@ -1426,23 +1360,6 @@ _GET_TWO_DOUBLE(gtk_plot_get_position, G
2badc30
 override gtk_plot_get_size noargs
2badc30
 _GET_TWO_DOUBLE(gtk_plot_get_size, GTK_PLOT)
2badc30
 %%
2badc30
-override gtk_plot_axis_get_attributes kwargs
2badc30
-static PyObject *
2badc30
-_wrap_gtk_plot_axis_get_attributes(PyGObject *self, PyObject *args, PyObject *kwargs)
2badc30
-{
2badc30
-    static char *kwlist[] = { "axis", NULL };
2badc30
-    PyObject *py_axis = NULL;
2badc30
-    gfloat width;
2badc30
-    GdkColor color = {0, };
2badc30
-    GtkPlotAxisPos axis;
2badc30
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:GtkPlot.axis_get_attributes", kwlist, &py_axis))
2badc30
-        return NULL;
2badc30
-    if (pyg_enum_get_value(GTK_TYPE_PLOT_AXIS_POS, py_axis, (gint *)&axis))
2badc30
-        return NULL;
2badc30
-    gtk_plot_axis_get_attributes(GTK_PLOT(self->obj), axis, &width, &color;;
2badc30
-    return Py_BuildValue("(dN)", (double)width, pyg_boxed_new(GDK_TYPE_COLOR, &color, TRUE, TRUE));
2badc30
-}
2badc30
-%%
2badc30
 override gtk_plot_grids_visible noargs
2badc30
 static PyObject *
2badc30
 _wrap_gtk_plot_grids_visible(PyGObject *self)
2badc30
@@ -2020,7 +1937,7 @@ override gtk_sheet_new kwargs
2badc30
 static int
2badc30
 _wrap_gtk_sheet_new(PyGObject *self, PyObject *args, PyObject *kwargs)
2badc30
 {
2badc30
-    static char *kwlist1[] = { "rows", "columns", "title" "browser", NULL };
2badc30
+    static char *kwlist1[] = { "rows", "columns", "title", "browser", NULL };
2badc30
     static char *kwlist2[] = { "rows", "columns", "title", "entry_type", NULL };
2badc30
     
2badc30
     int rows, columns;
2badc30
@@ -2134,7 +2051,7 @@ _wrap_gtk_plot_text_get_area(PyObject *s
2badc30
     '("gint*" "height")
2badc30
     */
2badc30
     gchar *text, *font_name;
2badc30
-    gint angle, font_size, x, y, width, height;
2badc30
+    gint angle, font_size, x, y, width, height, just_;
2badc30
     GtkJustification just;
2badc30
     PyObject *py_just = NULL;
2badc30
 
2badc30
@@ -2143,9 +2060,10 @@ _wrap_gtk_plot_text_get_area(PyObject *s
2badc30
     if (PyArg_ParseTupleAndKeywords(args, kwargs, "siOsi:plot_text_get_size", kwlist,
2badc30
 				    &text, &angle, &py_just, &font_name, &font_size))
2badc30
 	return NULL;
2badc30
-    if (pyg_enum_get_value(GTK_TYPE_JUSTIFICATION, py_just, (gint *)&just))
2badc30
+    if (pyg_enum_get_value(GTK_TYPE_JUSTIFICATION, py_just, &just_))
2badc30
         return NULL;
2badc30
 
2badc30
+    just = just_;
2badc30
     gtk_plot_text_get_area(text, angle, just, font_name, font_size, &x, &y, &width, &height);
2badc30
     return Py_BuildValue("(iiii)", x, y, width, height);
2badc30
 }