[Python-gtkextra-commits] CVS: python-gtkextra2/gtkextra gtkextra-addons.defs,NONE,1.1 gtkextra-types.defs,NONE,1.1 mycodegen.py,NONE,1.1 .cvsignore,1.1,1.2 Makefile.am,1.2,1.3 gtkextra.defs,1.1.1.1,1.2 gtkextra.override,1.1.1.1,1.2 gtkextramodule.c,1.1.1.1,1.2

[<pyt...@li...>]

Update of /cvsroot/python-gtkextra/python-gtkextra2/gtkextra
In directory usw-pr-cvs1:/tmp/cvs-serv20769/gtkextra

Modified Files:
	.cvsignore Makefile.am gtkextra.defs gtkextra.override 
	gtkextramodule.c 
Added Files:
	gtkextra-addons.defs gtkextra-types.defs mycodegen.py 
Log Message:
little bit closer

--- NEW FILE: gtkextra-addons.defs ---
;; Not from any header file

;; Careful not to clash with GtkWindow.set_flags()
(define-method plot_canvas_set_flags
  (of-object "GtkPlotCanvas")
  (c-name "gtk_plot_canvas_set_flags")
  (return-type "guint16")
  (parameters
    '("guint16" "flags")
  )
)

(define-method plot_canvas_unset_flags
  (of-object "GtkPlotCanvas")
  (c-name "gtk_plot_canvas_unset_flags")
  (return-type "guint16")
  (parameters
    '("guint16" "flags")
  )
)

--- NEW FILE: gtkextra-types.defs ---
;; -*- scheme -*-

; object definitions ...

(define-object CharSelection
  (in-module "Gtk")
  (parent "GtkWindow")
  (c-name "GtkCharSelection")
  (gtype-id "GTK_TYPE_CHAR_SELECTION")
  (fields
    '("GtkFontCombo*" "font_combo")
    '("GtkTable*" "table")
    '("gint" "selection")
    '("GtkWidget*" "ok_button")
    '("GtkWidget*" "cancel_button")
    '("GtkWidget*" "action_area")
  )
)

(define-object CheckItem
  (in-module "Gtk")
  (parent "GtkToggleButton")
  (c-name "GtkCheckItem")
  (gtype-id "GTK_TYPE_CHECK_ITEM")
)

(define-object ComboBox
  (in-module "Gtk")
  (parent "GtkHBox")
  (c-name "GtkComboBox")
  (gtype-id "GTK_TYPE_COMBO_BOX")
)

(define-object ColorCombo
  (in-module "Gtk")
  (parent "GtkComboBox")
  (c-name "GtkColorCombo")
  (gtype-id "GTK_TYPE_COLOR_COMBO")
)

(define-object BorderCombo
  (in-module "Gtk")
  (parent "GtkComboBox")
  (c-name "GtkBorderCombo")
  (gtype-id "GTK_TYPE_BORDER_COMBO")
)

(define-object DirTree
  (in-module "Gtk")
  (parent "GtkCTree")
  (c-name "GtkDirTree")
  (gtype-id "GTK_TYPE_DIR_TREE")
)

(define-object FontCombo
  (in-module "Gtk")
  (parent "GtkToolbar")
  (c-name "GtkFontCombo")
  (gtype-id "GTK_TYPE_FONT_COMBO")
)

(define-object IconFileSel
  (in-module "Gtk")
  (parent "GtkWindow")
  (c-name "GtkIconFileSel")
  (gtype-id "GTK_TYPE_ICON_FILE_SEL")
)

(define-object IconList
  (in-module "Gtk")
  (parent "GtkFixed")
  (c-name "GtkIconList")
  (gtype-id "GTK_TYPE_ICON_LIST")
)

(define-object FileList
  (in-module "Gtk")
  (parent "GtkIconList")
  (c-name "GtkFileList")
  (gtype-id "GTK_TYPE_FILE_LIST")
)

(define-object ItemEntry
  (in-module "Gtk")
  (parent "GtkEntry")
  (c-name "GtkItemEntry")
  (gtype-id "GTK_TYPE_ITEM_ENTRY")
)

;; Missed by h2def.py
(define-object PlotCanvas
  (in-module "Gtk")
  (parent "GtkFixed")
  (c-name "GtkPlotCanvas")
  (gtype-id "GTK_TYPE_PLOT_CANVAS")
  (fields
    '("guint16"  "flags")
  )
)

(define-object Plot
  (in-module "Gtk")
  (parent "GtkWidget")
  (c-name "GtkPlot")
  (gtype-id "GTK_TYPE_PLOT")
)

(define-object Plot3D
  (in-module "Gtk")
  (parent "GtkPlot")
  (c-name "GtkPlot3D")
  (gtype-id "GTK_TYPE_PLOT3_D")
)

(define-object PlotAxis
  (in-module "Gtk")
  (parent "GtkObject")
  (c-name "GtkPlotAxis")
  (gtype-id "GTK_TYPE_PLOT_AXIS")
)

(define-object PlotDT
  (in-module "Gtk")
  (parent "GtkObject")
  (c-name "GtkPlotDT")
  (gtype-id "GTK_TYPE_PLOT_DT")
)

(define-object PlotData
  (in-module "Gtk")
  (parent "GtkWidget")
  (c-name "GtkPlotData")
  (gtype-id "GTK_TYPE_PLOT_DATA")
)

(define-object PlotBox
  (in-module "Gtk")
  (parent "GtkPlotData")
  (c-name "GtkPlotBox")
  (gtype-id "GTK_TYPE_PLOT_BOX")
)

(define-object PlotBar
  (in-module "Gtk")
  (parent "GtkPlotData")
  (c-name "GtkPlotBar")
  (gtype-id "GTK_TYPE_PLOT_BAR")
)

(define-object PlotFlux
  (in-module "Gtk")
  (parent "GtkPlotData")
  (c-name "GtkPlotFlux")
  (gtype-id "GTK_TYPE_PLOT_FLUX")
)

(define-object PlotPC
  (in-module "Gtk")
  (parent "GtkObject")
  (c-name "GtkPlotPC")
  (gtype-id "GTK_TYPE_PLOT_PC")
)

(define-object PlotGdk
  (in-module "Gtk")
  (parent "GtkPlotPC")
  (c-name "GtkPlotGdk")
  (gtype-id "GTK_TYPE_PLOT_GDK")
)

(define-object PlotPS
  (in-module "Gtk")
  (parent "GtkPlotPC")
  (c-name "GtkPlotPS")
  (gtype-id "GTK_TYPE_PLOT_PS")
)

(define-object PlotPixmap
  (in-module "Gtk")
  (parent "GtkPlotData")
  (c-name "GtkPlotPixmap")
  (gtype-id "GTK_TYPE_PLOT_PIXMAP")
)

(define-object PlotPolar
  (in-module "Gtk")
  (parent "GtkPlot")
  (c-name "GtkPlotPolar")
  (gtype-id "GTK_TYPE_PLOT_POLAR")
)

(define-object PlotSurface
  (in-module "Gtk")
  (parent "GtkPlotData")
  (c-name "GtkPlotSurface")
  (gtype-id "GTK_TYPE_PLOT_SURFACE")
)

(define-object PlotCSurface
  (in-module "Gtk")
  (parent "GtkPlotSurface")
  (c-name "GtkPlotCSurface")
  (gtype-id "GTK_TYPE_PLOT_CSURFACE")
)

(define-object Sheet
  (in-module "Gtk")
  (parent "GtkContainer")
  (c-name "GtkSheet")
  (gtype-id "GTK_TYPE_SHEET")
)

(define-object ToggleCombo
  (in-module "Gtk")
  (parent "GtkComboBox")
  (c-name "GtkToggleCombo")
  (gtype-id "GTK_TYPE_TOGGLE_COMBO")
)

;; Boxed types

(define-pointer PSFont
  (in-module "Gtk")
  (c-name "GtkPSFont")
  (gtype-id "GTK_TYPE_PSFONT")
  (fields
    '("const-gchar*" "fontname")
    '("const-gchar*" "psname")
    '("const-gchar*" "family")
    '("const-gchar*" "pango_description")
    '("const-gchar*" "i18n_latinfamily")
    '("gboolean" "italic")
    '("gboolean" "bold")
    '("gboolean" "vertical")
    )
)

(define-pointer PlotCanvasChild
  (in-module "Gtk")
  (c-name "GtkPlotCanvasChild")
  (gtype-id "GTK_TYPE_PLOT_CANVAS_CHILD")
  (fields
    '("gint" "data")
  )
)

;; Enumerations and flags ...

(define-enum PlotPlane
  (in-module "Gtk")
  (c-name "GtkPlotPlane")
  (gtype-id "GTK_TYPE_PLOT_PLANE")
  (values
    '("xy" "GTK_PLOT_PLANE_XY")
    '("yx" "GTK_PLOT_PLANE_YX")
    '("xz" "GTK_PLOT_PLANE_XZ")
    '("zx" "GTK_PLOT_PLANE_ZX")
    '("yz" "GTK_PLOT_PLANE_YZ")
    '("zy" "GTK_PLOT_PLANE_ZY")
  )
)

(define-flags PlotSide
  (in-module "Gtk")
  (c-name "GtkPlotSide")
  (gtype-id "GTK_TYPE_PLOT_SIDE")
  (values
    '("xy" "GTK_PLOT_SIDE_XY")
    '("xz" "GTK_PLOT_SIDE_XZ")
    '("yx" "GTK_PLOT_SIDE_YX")
    '("yz" "GTK_PLOT_SIDE_YZ")
    '("zx" "GTK_PLOT_SIDE_ZX")
    '("zy" "GTK_PLOT_SIDE_ZY")
  )
)

(define-enum PlotBarUnits
  (in-module "Gtk")
  (c-name "GtkPlotBarUnits")
  (gtype-id "GTK_TYPE_PLOT_BAR_UNITS")
  (values
    '("points" "GTK_PLOT_BAR_POINTS")
    '("relative" "GTK_PLOT_BAR_RELATIVE")
    '("absolute" "GTK_PLOT_BAR_ABSOLUTE")
  )
)

(define-enum PlotCanvasAction
  (in-module "Gtk")
  (c-name "GtkPlotCanvasAction")
  (gtype-id "GTK_TYPE_PLOT_CANVAS_ACTION")
  (values
    '("inactive" "GTK_PLOT_CANVAS_ACTION_INACTIVE")
    '("selection" "GTK_PLOT_CANVAS_ACTION_SELECTION")
    '("drag" "GTK_PLOT_CANVAS_ACTION_DRAG")
    '("resize" "GTK_PLOT_CANVAS_ACTION_RESIZE")
  )
)

(define-flags PlotCanvasFlag
  (in-module "Gtk")
  (c-name "GtkPlotCanvasFlag")
  (gtype-id "GTK_TYPE_PLOT_CANVAS_FLAG")
  (values
    '("frozen" "GTK_PLOT_CANVAS_FROZEN")
    '("can-move" "GTK_PLOT_CANVAS_CAN_MOVE")
    '("can-x-resize" "GTK_PLOT_CANVAS_CAN_X_RESIZE")
    '("can-y-resize" "GTK_PLOT_CANVAS_CAN_Y_RESIZE")
  )
)

(define-flags PlotCanvasArrow
  (in-module "Gtk")
  (c-name "GtkPlotCanvasArrow")
  (gtype-id "GTK_TYPE_PLOT_CANVAS_ARROW")
  (values
    '("none" "GTK_PLOT_ARROW_NONE")
    '("origin" "GTK_PLOT_ARROW_ORIGIN")
    '("end" "GTK_PLOT_ARROW_END")
  )
)

(define-enum PlotCanvasSelection
  (in-module "Gtk")
  (c-name "GtkPlotCanvasSelection")
  (gtype-id "GTK_TYPE_PLOT_CANVAS_SELECTION")
  (values
    '("none" "GTK_PLOT_CANVAS_SELECT_NONE")
    '("markers" "GTK_PLOT_CANVAS_SELECT_MARKERS")
    '("target" "GTK_PLOT_CANVAS_SELECT_TARGET")
  )
)

(define-enum PlotCanvasSelectionMode
  (in-module "Gtk")
  (c-name "GtkPlotCanvasSelectionMode")
  (gtype-id "GTK_TYPE_PLOT_CANVAS_SELECTION_MODE")
  (values
    '("1" "GTK_PLOT_CANVAS_SELECT_CLICK_1")
    '("2" "GTK_PLOT_CANVAS_SELECT_CLICK_2")
  )
)

(define-enum PlotCanvasType
  (in-module "Gtk")
  (c-name "GtkPlotCanvasType")
  (gtype-id "GTK_TYPE_PLOT_CANVAS_TYPE")
  (values
    '("none" "GTK_PLOT_CANVAS_NONE")
    '("plot" "GTK_PLOT_CANVAS_PLOT")
    '("axis" "GTK_PLOT_CANVAS_AXIS")
    '("legends" "GTK_PLOT_CANVAS_LEGENDS")
    '("title" "GTK_PLOT_CANVAS_TITLE")
    '("text" "GTK_PLOT_CANVAS_TEXT")
    '("data" "GTK_PLOT_CANVAS_DATA")
    '("line" "GTK_PLOT_CANVAS_LINE")
    '("rectangle" "GTK_PLOT_CANVAS_RECTANGLE")
    '("ellipse" "GTK_PLOT_CANVAS_ELLIPSE")
    '("pixmap" "GTK_PLOT_CANVAS_PIXMAP")
    '("marker" "GTK_PLOT_CANVAS_MARKER")
    '("custom" "GTK_PLOT_CANVAS_CUSTOM")
  )
)

(define-enum PlotCanvasPos
  (in-module "Gtk")
  (c-name "GtkPlotCanvasPos")
  (gtype-id "GTK_TYPE_PLOT_CANVAS_POS")
  (values
    '("out" "GTK_PLOT_CANVAS_OUT")
    '("in" "GTK_PLOT_CANVAS_IN")
    '("left" "GTK_PLOT_CANVAS_LEFT")
    '("right" "GTK_PLOT_CANVAS_RIGHT")
    '("top" "GTK_PLOT_CANVAS_TOP")
    '("bottom" "GTK_PLOT_CANVAS_BOTTOM")
    '("top-left" "GTK_PLOT_CANVAS_TOP_LEFT")
    '("top-right" "GTK_PLOT_CANVAS_TOP_RIGHT")
    '("bottom-left" "GTK_PLOT_CANVAS_BOTTOM_LEFT")
    '("bottom-right" "GTK_PLOT_CANVAS_BOTTOM_RIGHT")
  )
)

(define-enum PlotScale
  (in-module "Gtk")
  (c-name "GtkPlotScale")
  (gtype-id "GTK_TYPE_PLOT_SCALE")
  (values
    '("inear" "GTK_PLOT_SCALE_LINEAR")
    '("og10" "GTK_PLOT_SCALE_LOG10")
  )
)

(define-enum PlotSymbolType
  (in-module "Gtk")
  (c-name "GtkPlotSymbolType")
  (gtype-id "GTK_TYPE_PLOT_SYMBOL_TYPE")
  (values
    '("none" "GTK_PLOT_SYMBOL_NONE")
    '("square" "GTK_PLOT_SYMBOL_SQUARE")
    '("circle" "GTK_PLOT_SYMBOL_CIRCLE")
    '("up-triangle" "GTK_PLOT_SYMBOL_UP_TRIANGLE")
    '("down-triangle" "GTK_PLOT_SYMBOL_DOWN_TRIANGLE")
    '("right-triangle" "GTK_PLOT_SYMBOL_RIGHT_TRIANGLE")
    '("left-triangle" "GTK_PLOT_SYMBOL_LEFT_TRIANGLE")
    '("diamond" "GTK_PLOT_SYMBOL_DIAMOND")
    '("plus" "GTK_PLOT_SYMBOL_PLUS")
    '("cross" "GTK_PLOT_SYMBOL_CROSS")
    '("star" "GTK_PLOT_SYMBOL_STAR")
    '("dot" "GTK_PLOT_SYMBOL_DOT")
    '("impulse" "GTK_PLOT_SYMBOL_IMPULSE")
  )
)

(define-enum PlotSymbolStyle
  (in-module "Gtk")
  (c-name "GtkPlotSymbolStyle")
  (gtype-id "GTK_TYPE_PLOT_SYMBOL_STYLE")
  (values
    '("empty" "GTK_PLOT_SYMBOL_EMPTY")
    '("filled" "GTK_PLOT_SYMBOL_FILLED")
    '("opaque" "GTK_PLOT_SYMBOL_OPAQUE")
  )
)

(define-enum PlotBorderStyle
  (in-module "Gtk")
  (c-name "GtkPlotBorderStyle")
  (gtype-id "GTK_TYPE_PLOT_BORDER_STYLE")
  (values
    '("none" "GTK_PLOT_BORDER_NONE")
    '("line" "GTK_PLOT_BORDER_LINE")
    '("shadow" "GTK_PLOT_BORDER_SHADOW")
  )
)

(define-enum PlotLineStyle
  (in-module "Gtk")
  (c-name "GtkPlotLineStyle")
  (gtype-id "GTK_TYPE_PLOT_LINE_STYLE")
  (values
    '("none" "GTK_PLOT_LINE_NONE")
    '("solid" "GTK_PLOT_LINE_SOLID")
    '("dotted" "GTK_PLOT_LINE_DOTTED")
    '("dashed" "GTK_PLOT_LINE_DASHED")
    '("dot-dash" "GTK_PLOT_LINE_DOT_DASH")
    '("dot-dot-dash" "GTK_PLOT_LINE_DOT_DOT_DASH")
    '("dot-dash-dash" "GTK_PLOT_LINE_DOT_DASH_DASH")
  )
)

(define-enum PlotConnector
  (in-module "Gtk")
  (c-name "GtkPlotConnector")
  (gtype-id "GTK_TYPE_PLOT_CONNECTOR")
  (values
    '("none" "GTK_PLOT_CONNECT_NONE")
    '("straight" "GTK_PLOT_CONNECT_STRAIGHT")
    '("spline" "GTK_PLOT_CONNECT_SPLINE")
    '("hv-step" "GTK_PLOT_CONNECT_HV_STEP")
    '("vh-step" "GTK_PLOT_CONNECT_VH_STEP")
    '("middle-step" "GTK_PLOT_CONNECT_MIDDLE_STEP")
  )
)

(define-flags PlotLabelPos
  (in-module "Gtk")
  (c-name "GtkPlotLabelPos")
  (gtype-id "GTK_TYPE_PLOT_LABEL_POS")
  (values
    '("none" "GTK_PLOT_LABEL_NONE")
    '("in" "GTK_PLOT_LABEL_IN")
    '("out" "GTK_PLOT_LABEL_OUT")
  )
)

(define-enum PlotError
  (in-module "Gtk")
  (c-name "GtkPlotError")
  (gtype-id "GTK_TYPE_PLOT_ERROR")
  (values
    '("div-zero" "GTK_PLOT_ERROR_DIV_ZERO")
    '("log-neg" "GTK_PLOT_ERROR_LOG_NEG")
  )
)

(define-enum PlotOrientation
  (in-module "Gtk")
  (c-name "GtkPlotOrientation")
  (gtype-id "GTK_TYPE_PLOT_ORIENTATION")
  (values
    '("x" "GTK_PLOT_AXIS_X")
    '("y" "GTK_PLOT_AXIS_Y")
    '("z" "GTK_PLOT_AXIS_Z")
  )
)

(define-enum PlotAxisPos
  (in-module "Gtk")
  (c-name "GtkPlotAxisPos")
  (gtype-id "GTK_TYPE_PLOT_AXIS_POS")
  (values
    '("left" "GTK_PLOT_AXIS_LEFT")
    '("right" "GTK_PLOT_AXIS_RIGHT")
    '("top" "GTK_PLOT_AXIS_TOP")
    '("bottom" "GTK_PLOT_AXIS_BOTTOM")
  )
)

(define-enum PlotLabelStyle
  (in-module "Gtk")
  (c-name "GtkPlotLabelStyle")
  (gtype-id "GTK_TYPE_PLOT_LABEL_STYLE")
  (values
    '("float" "GTK_PLOT_LABEL_FLOAT")
    '("exp" "GTK_PLOT_LABEL_EXP")
    '("pow" "GTK_PLOT_LABEL_POW")
  )
)

(define-flags PlotTicksPos
  (in-module "Gtk")
  (c-name "GtkPlotTicksPos")
  (gtype-id "GTK_TYPE_PLOT_TICKS_POS")
  (values
    '("none" "GTK_PLOT_TICKS_NONE")
    '("in" "GTK_PLOT_TICKS_IN")
    '("out" "GTK_PLOT_TICKS_OUT")
  )
)

(define-enum SheetAttrType
  (in-module "Gtk")
  (c-name "GtkSheetAttrType")
  (gtype-id "GTK_TYPE_SHEET_ATTR_TYPE")
  (values
    '("foreground" "GTK_SHEET_FOREGROUND")
    '("background" "GTK_SHEET_BACKGROUND")
    '("font" "GTK_SHEET_FONT")
    '("justification" "GTK_SHEET_JUSTIFICATION")
    '("border" "GTK_SHEET_BORDER")
    '("border-color" "GTK_SHEET_BORDER_COLOR")
    '("is-editable" "GTK_SHEET_IS_EDITABLE")
    '("is-visible" "GTK_SHEET_IS_VISIBLE")
  )
)



--- NEW FILE: mycodegen.py ---
#!/bin/env python

# This is a temporary hack.
import sys
sys.path.append('/usr/share/pygtk/2.0/')
del sys

# Use the PyGtk2 codegen modules
from codegen.argtypes import matcher
import codegen.codegen


matcher.register('GdkWChar', matcher.get('gint32'))

codegen.codegen.main()


Index: .cvsignore
===================================================================
RCS file: /cvsroot/python-gtkextra/python-gtkextra2/gtkextra/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** .cvsignore	10 Jul 2002 19:26:06 -0000	1.1
--- .cvsignore	11 Jul 2002 19:17:44 -0000	1.2
***************
*** 1,3 ****
  Makefile.in
! 
  
--- 1,8 ----
+ gtkextra.c
+ Makefile
  Makefile.in
! *.lo
! *.la
! .deps
! .libs
  

Index: Makefile.am
===================================================================
RCS file: /cvsroot/python-gtkextra/python-gtkextra2/gtkextra/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	10 Jul 2002 19:26:06 -0000	1.2
--- Makefile.am	11 Jul 2002 19:17:44 -0000	1.3
***************
*** 25,38 ****
  gtkextramodule_la_LIBADD =  $(GTKEXTRA_LIBS) $(PYGTK_LIBS) $(GTK_LIBS)
  gtkextramodule_la_SOURCES = gtkextramodule.c
! gtkextra.c: $(COMMONDEFS) gtkextra.override
  nodist_gtkextramodule_la_SOURCES = gtkextra.c
  
  CLEANFILES += gtkextra.c
! defs_DATA += gtkextra.defs
  EXTRA_DIST += gtkextra.override
  
  .defs.c:
  	(cd $(srcdir) \
! 	 && $(PYTHON) $(PYGTK_DEFSDIR)/../codegen/codegen.py \
  	    --register $(PYGTK_DEFSDIR)/pango-types.defs \
  	    --register $(PYGTK_DEFSDIR)/gdk-types.defs \
--- 25,41 ----
  gtkextramodule_la_LIBADD =  $(GTKEXTRA_LIBS) $(PYGTK_LIBS) $(GTK_LIBS)
  gtkextramodule_la_SOURCES = gtkextramodule.c
! gtkextra.c: $(COMMONDEFS) gtkextra-addons.defs gtkextra-types.defs gtkextra.override
  nodist_gtkextramodule_la_SOURCES = gtkextra.c
  
  CLEANFILES += gtkextra.c
! defs_DATA += gtkextra.defs gtkextra-types.defs
  EXTRA_DIST += gtkextra.override
  
+ #CODEGEN=$(PYGTK_DEFSDIR)/../codegen/codegen.py
+ CODEGEN=$(srcdir)/mycodegen.py
+ 
  .defs.c:
  	(cd $(srcdir) \
! 	 && $(PYTHON) $(CODEGEN) \
  	    --register $(PYGTK_DEFSDIR)/pango-types.defs \
  	    --register $(PYGTK_DEFSDIR)/gdk-types.defs \

Index: gtkextra.defs
===================================================================
RCS file: /cvsroot/python-gtkextra/python-gtkextra2/gtkextra/gtkextra.defs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** gtkextra.defs	10 Jul 2002 19:07:02 -0000	1.1.1.1
--- gtkextra.defs	11 Jul 2002 19:17:44 -0000	1.2
***************
*** 5,514 ****
  ;; Then merge old defs with new defs with mergedefs.py (for fields)
  
! ; object definitions ...
! (define-object CharSelection
!   (in-module "Gtk")
!   (parent "GtkWindow")
!   (c-name "GtkCharSelection")
!   (gtype-id "GTK_TYPE_CHAR_SELECTION")
!   (fields
!     '("GtkFontCombo*" "font_combo")
!     '("GtkTable*" "table")
!     ;;GtkToggleButton *button[256];
!     '("gint" "selection")
!     '("GtkWidget*" "ok_button")
!     '("GtkWidget*" "cancel_button")
!     '("GtkWidget*" "action_area")
!   )
! )
! 
! (define-object CheckItem
!   (in-module "Gtk")
!   (parent "GtkToggleButton")
!   (c-name "GtkCheckItem")
!   (gtype-id "GTK_TYPE_CHECK_ITEM")
! )
! 
! (define-object ComboBox
!   (in-module "Gtk")
!   (parent "GtkHBox")
!   (c-name "GtkComboBox")
!   (gtype-id "GTK_TYPE_COMBO_BOX")
! )
! 
! (define-object ColorCombo
!   (in-module "Gtk")
!   (parent "GtkComboBox")
!   (c-name "GtkColorCombo")
!   (gtype-id "GTK_TYPE_COLOR_COMBO")
! )
! 
! (define-object BorderCombo
!   (in-module "Gtk")
!   (parent "GtkComboBox")
!   (c-name "GtkBorderCombo")
!   (gtype-id "GTK_TYPE_BORDER_COMBO")
! )
! 
! (define-object DirTree
!   (in-module "Gtk")
!   (parent "GtkCTree")
!   (c-name "GtkDirTree")
!   (gtype-id "GTK_TYPE_DIR_TREE")
! )
! 
! (define-object FontCombo
!   (in-module "Gtk")
!   (parent "GtkToolbar")
!   (c-name "GtkFontCombo")
!   (gtype-id "GTK_TYPE_FONT_COMBO")
! )
! 
! (define-object IconFileSel
!   (in-module "Gtk")
!   (parent "GtkWindow")
!   (c-name "GtkIconFileSel")
!   (gtype-id "GTK_TYPE_ICON_FILE_SEL")
! )
! 
! (define-object IconList
!   (in-module "Gtk")
!   (parent "GtkFixed")
!   (c-name "GtkIconList")
!   (gtype-id "GTK_TYPE_ICON_LIST")
! )
! 
! (define-object FileList
!   (in-module "Gtk")
!   (parent "GtkIconList")
!   (c-name "GtkFileList")
!   (gtype-id "GTK_TYPE_FILE_LIST")
! )
! 
! (define-object ItemEntry
!   (in-module "Gtk")
!   (parent "GtkEntry")
!   (c-name "GtkItemEntry")
!   (gtype-id "GTK_TYPE_ITEM_ENTRY")
! )
! 
! (define-object Plot
!   (in-module "Gtk")
!   (parent "GtkWidget")
!   (c-name "GtkPlot")
!   (gtype-id "GTK_TYPE_PLOT")
! )
! 
! (define-object Plot3D
!   (in-module "Gtk")
!   (parent "GtkPlot")
!   (c-name "GtkPlot3D")
!   (gtype-id "GTK_TYPE_PLOT3_D")
! )
! 
! (define-object PlotAxis
!   (in-module "Gtk")
!   (parent "GtkObject")
!   (c-name "GtkPlotAxis")
!   (gtype-id "GTK_TYPE_PLOT_AXIS")
! )
! 
! (define-object PlotDT
!   (in-module "Gtk")
!   (parent "GtkObject")
!   (c-name "GtkPlotDT")
!   (gtype-id "GTK_TYPE_PLOT_DT")
! )
! 
! (define-object PlotData
!   (in-module "Gtk")
!   (parent "GtkWidget")
!   (c-name "GtkPlotData")
!   (gtype-id "GTK_TYPE_PLOT_DATA")
! )
! 
! (define-object PlotBox
!   (in-module "Gtk")
!   (parent "GtkPlotData")
!   (c-name "GtkPlotBox")
!   (gtype-id "GTK_TYPE_PLOT_BOX")
! )
! 
! (define-object PlotBar
!   (in-module "Gtk")
!   (parent "GtkPlotData")
!   (c-name "GtkPlotBar")
!   (gtype-id "GTK_TYPE_PLOT_BAR")
! )
! 
! (define-object PlotFlux
!   (in-module "Gtk")
!   (parent "GtkPlotData")
!   (c-name "GtkPlotFlux")
!   (gtype-id "GTK_TYPE_PLOT_FLUX")
! )
! 
! (define-object PlotPC
!   (in-module "Gtk")
!   (parent "GtkObject")
!   (c-name "GtkPlotPC")
!   (gtype-id "GTK_TYPE_PLOT_PC")
! )
! 
! (define-object PlotGdk
!   (in-module "Gtk")
!   (parent "GtkPlotPC")
!   (c-name "GtkPlotGdk")
!   (gtype-id "GTK_TYPE_PLOT_GDK")
! )
! 
! (define-object PlotPS
!   (in-module "Gtk")
!   (parent "GtkPlotPC")
!   (c-name "GtkPlotPS")
!   (gtype-id "GTK_TYPE_PLOT_PS")
! )
! 
! (define-object PlotPixmap
!   (in-module "Gtk")
!   (parent "GtkPlotData")
!   (c-name "GtkPlotPixmap")
!   (gtype-id "GTK_TYPE_PLOT_PIXMAP")
! )
! 
! (define-object PlotPolar
!   (in-module "Gtk")
!   (parent "GtkPlot")
!   (c-name "GtkPlotPolar")
!   (gtype-id "GTK_TYPE_PLOT_POLAR")
! )
! 
! (define-object PlotSurface
!   (in-module "Gtk")
!   (parent "GtkPlotData")
!   (c-name "GtkPlotSurface")
!   (gtype-id "GTK_TYPE_PLOT_SURFACE")
! )
! 
! (define-object PlotCSurface
!   (in-module "Gtk")
!   (parent "GtkPlotSurface")
!   (c-name "GtkPlotCSurface")
!   (gtype-id "GTK_TYPE_PLOT_CSURFACE")
! )
! 
! (define-object Sheet
!   (in-module "Gtk")
!   (parent "GtkContainer")
!   (c-name "GtkSheet")
!   (gtype-id "GTK_TYPE_SHEET")
! )
! 
! (define-object ToggleCombo
!   (in-module "Gtk")
!   (parent "GtkComboBox")
!   (c-name "GtkToggleCombo")
!   (gtype-id "GTK_TYPE_TOGGLE_COMBO")
! )
! 
! ;; Enumerations and flags ...
! 
! (define-enum PlotPlane
!   (in-module "Gtk")
!   (c-name "GtkPlotPlane")
!   (gtype-id "GTK_TYPE_PLOT_PLANE")
!   (values
!     '("xy" "GTK_PLOT_PLANE_XY")
!     '("yx" "GTK_PLOT_PLANE_YX")
!     '("xz" "GTK_PLOT_PLANE_XZ")
!     '("zx" "GTK_PLOT_PLANE_ZX")
!     '("yz" "GTK_PLOT_PLANE_YZ")
!     '("zy" "GTK_PLOT_PLANE_ZY")
!   )
! )
! 
! (define-flags PlotSide
!   (in-module "Gtk")
!   (c-name "GtkPlotSide")
!   (gtype-id "GTK_TYPE_PLOT_SIDE")
!   (values
!     '("xy" "GTK_PLOT_SIDE_XY")
!     '("xz" "GTK_PLOT_SIDE_XZ")
!     '("yx" "GTK_PLOT_SIDE_YX")
!     '("yz" "GTK_PLOT_SIDE_YZ")
!     '("zx" "GTK_PLOT_SIDE_ZX")
!     '("zy" "GTK_PLOT_SIDE_ZY")
!   )
! )
! 
! (define-enum PlotBarUnits
!   (in-module "Gtk")
!   (c-name "GtkPlotBarUnits")
!   (gtype-id "GTK_TYPE_PLOT_BAR_UNITS")
!   (values
!     '("points" "GTK_PLOT_BAR_POINTS")
!     '("relative" "GTK_PLOT_BAR_RELATIVE")
!     '("absolute" "GTK_PLOT_BAR_ABSOLUTE")
!   )
! )
! 
! (define-enum PlotCanvasAction
!   (in-module "Gtk")
!   (c-name "GtkPlotCanvasAction")
!   (gtype-id "GTK_TYPE_PLOT_CANVAS_ACTION")
!   (values
!     '("inactive" "GTK_PLOT_CANVAS_ACTION_INACTIVE")
!     '("selection" "GTK_PLOT_CANVAS_ACTION_SELECTION")
!     '("drag" "GTK_PLOT_CANVAS_ACTION_DRAG")
!     '("resize" "GTK_PLOT_CANVAS_ACTION_RESIZE")
!   )
! )
! 
! (define-flags PlotCanvasFlag
!   (in-module "Gtk")
!   (c-name "GtkPlotCanvasFlag")
!   (gtype-id "GTK_TYPE_PLOT_CANVAS_FLAG")
!   (values
!     '("frozen" "GTK_PLOT_CANVAS_FROZEN")
!     '("can-move" "GTK_PLOT_CANVAS_CAN_MOVE")
!     '("can-x-resize" "GTK_PLOT_CANVAS_CAN_X_RESIZE")
!     '("can-y-resize" "GTK_PLOT_CANVAS_CAN_Y_RESIZE")
!   )
! )
! 
! (define-flags PlotCanvasArrow
!   (in-module "Gtk")
!   (c-name "GtkPlotCanvasArrow")
!   (gtype-id "GTK_TYPE_PLOT_CANVAS_ARROW")
!   (values
!     '("none" "GTK_PLOT_ARROW_NONE")
!     '("origin" "GTK_PLOT_ARROW_ORIGIN")
!     '("end" "GTK_PLOT_ARROW_END")
!   )
! )
! 
! (define-enum PlotCanvasSelection
!   (in-module "Gtk")
!   (c-name "GtkPlotCanvasSelection")
!   (gtype-id "GTK_TYPE_PLOT_CANVAS_SELECTION")
!   (values
!     '("none" "GTK_PLOT_CANVAS_SELECT_NONE")
!     '("markers" "GTK_PLOT_CANVAS_SELECT_MARKERS")
!     '("target" "GTK_PLOT_CANVAS_SELECT_TARGET")
!   )
! )
! 
! (define-enum PlotCanvasSelectionMode
!   (in-module "Gtk")
!   (c-name "GtkPlotCanvasSelectionMode")
!   (gtype-id "GTK_TYPE_PLOT_CANVAS_SELECTION_MODE")
!   (values
!     '("1" "GTK_PLOT_CANVAS_SELECT_CLICK_1")
!     '("2" "GTK_PLOT_CANVAS_SELECT_CLICK_2")
!   )
! )
! 
! (define-enum PlotCanvasType
!   (in-module "Gtk")
!   (c-name "GtkPlotCanvasType")
!   (gtype-id "GTK_TYPE_PLOT_CANVAS_TYPE")
!   (values
!     '("none" "GTK_PLOT_CANVAS_NONE")
!     '("plot" "GTK_PLOT_CANVAS_PLOT")
!     '("axis" "GTK_PLOT_CANVAS_AXIS")
!     '("legends" "GTK_PLOT_CANVAS_LEGENDS")
!     '("title" "GTK_PLOT_CANVAS_TITLE")
!     '("text" "GTK_PLOT_CANVAS_TEXT")
!     '("data" "GTK_PLOT_CANVAS_DATA")
!     '("line" "GTK_PLOT_CANVAS_LINE")
!     '("rectangle" "GTK_PLOT_CANVAS_RECTANGLE")
!     '("ellipse" "GTK_PLOT_CANVAS_ELLIPSE")
!     '("pixmap" "GTK_PLOT_CANVAS_PIXMAP")
!     '("marker" "GTK_PLOT_CANVAS_MARKER")
!     '("custom" "GTK_PLOT_CANVAS_CUSTOM")
!   )
! )
! 
! (define-enum PlotCanvasPos
!   (in-module "Gtk")
!   (c-name "GtkPlotCanvasPos")
!   (gtype-id "GTK_TYPE_PLOT_CANVAS_POS")
!   (values
!     '("out" "GTK_PLOT_CANVAS_OUT")
!     '("in" "GTK_PLOT_CANVAS_IN")
!     '("left" "GTK_PLOT_CANVAS_LEFT")
!     '("right" "GTK_PLOT_CANVAS_RIGHT")
!     '("top" "GTK_PLOT_CANVAS_TOP")
!     '("bottom" "GTK_PLOT_CANVAS_BOTTOM")
!     '("top-left" "GTK_PLOT_CANVAS_TOP_LEFT")
!     '("top-right" "GTK_PLOT_CANVAS_TOP_RIGHT")
!     '("bottom-left" "GTK_PLOT_CANVAS_BOTTOM_LEFT")
!     '("bottom-right" "GTK_PLOT_CANVAS_BOTTOM_RIGHT")
!   )
! )
! 
! (define-enum PlotScale
!   (in-module "Gtk")
!   (c-name "GtkPlotScale")
!   (gtype-id "GTK_TYPE_PLOT_SCALE")
!   (values
!     '("inear" "GTK_PLOT_SCALE_LINEAR")
!     '("og10" "GTK_PLOT_SCALE_LOG10")
!   )
! )
! 
! (define-enum PlotSymbolType
!   (in-module "Gtk")
!   (c-name "GtkPlotSymbolType")
!   (gtype-id "GTK_TYPE_PLOT_SYMBOL_TYPE")
!   (values
!     '("none" "GTK_PLOT_SYMBOL_NONE")
!     '("square" "GTK_PLOT_SYMBOL_SQUARE")
!     '("circle" "GTK_PLOT_SYMBOL_CIRCLE")
!     '("up-triangle" "GTK_PLOT_SYMBOL_UP_TRIANGLE")
!     '("down-triangle" "GTK_PLOT_SYMBOL_DOWN_TRIANGLE")
!     '("right-triangle" "GTK_PLOT_SYMBOL_RIGHT_TRIANGLE")
!     '("left-triangle" "GTK_PLOT_SYMBOL_LEFT_TRIANGLE")
!     '("diamond" "GTK_PLOT_SYMBOL_DIAMOND")
!     '("plus" "GTK_PLOT_SYMBOL_PLUS")
!     '("cross" "GTK_PLOT_SYMBOL_CROSS")
!     '("star" "GTK_PLOT_SYMBOL_STAR")
!     '("dot" "GTK_PLOT_SYMBOL_DOT")
!     '("impulse" "GTK_PLOT_SYMBOL_IMPULSE")
!   )
! )
! 
! (define-enum PlotSymbolStyle
!   (in-module "Gtk")
!   (c-name "GtkPlotSymbolStyle")
!   (gtype-id "GTK_TYPE_PLOT_SYMBOL_STYLE")
!   (values
!     '("empty" "GTK_PLOT_SYMBOL_EMPTY")
!     '("filled" "GTK_PLOT_SYMBOL_FILLED")
!     '("opaque" "GTK_PLOT_SYMBOL_OPAQUE")
!   )
! )
! 
! (define-enum PlotBorderStyle
!   (in-module "Gtk")
!   (c-name "GtkPlotBorderStyle")
!   (gtype-id "GTK_TYPE_PLOT_BORDER_STYLE")
!   (values
!     '("none" "GTK_PLOT_BORDER_NONE")
!     '("line" "GTK_PLOT_BORDER_LINE")
!     '("shadow" "GTK_PLOT_BORDER_SHADOW")
!   )
! )
! 
! (define-enum PlotLineStyle
!   (in-module "Gtk")
!   (c-name "GtkPlotLineStyle")
!   (gtype-id "GTK_TYPE_PLOT_LINE_STYLE")
!   (values
!     '("none" "GTK_PLOT_LINE_NONE")
!     '("solid" "GTK_PLOT_LINE_SOLID")
!     '("dotted" "GTK_PLOT_LINE_DOTTED")
!     '("dashed" "GTK_PLOT_LINE_DASHED")
!     '("dot-dash" "GTK_PLOT_LINE_DOT_DASH")
!     '("dot-dot-dash" "GTK_PLOT_LINE_DOT_DOT_DASH")
!     '("dot-dash-dash" "GTK_PLOT_LINE_DOT_DASH_DASH")
!   )
! )
! 
! (define-enum PlotConnector
!   (in-module "Gtk")
!   (c-name "GtkPlotConnector")
!   (gtype-id "GTK_TYPE_PLOT_CONNECTOR")
!   (values
!     '("none" "GTK_PLOT_CONNECT_NONE")
!     '("straight" "GTK_PLOT_CONNECT_STRAIGHT")
!     '("spline" "GTK_PLOT_CONNECT_SPLINE")
!     '("hv-step" "GTK_PLOT_CONNECT_HV_STEP")
!     '("vh-step" "GTK_PLOT_CONNECT_VH_STEP")
!     '("middle-step" "GTK_PLOT_CONNECT_MIDDLE_STEP")
!   )
! )
! 
! (define-flags PlotLabelPos
!   (in-module "Gtk")
!   (c-name "GtkPlotLabelPos")
!   (gtype-id "GTK_TYPE_PLOT_LABEL_POS")
!   (values
!     '("none" "GTK_PLOT_LABEL_NONE")
!     '("in" "GTK_PLOT_LABEL_IN")
!     '("out" "GTK_PLOT_LABEL_OUT")
!   )
! )
! 
! (define-enum PlotError
!   (in-module "Gtk")
!   (c-name "GtkPlotError")
!   (gtype-id "GTK_TYPE_PLOT_ERROR")
!   (values
!     '("div-zero" "GTK_PLOT_ERROR_DIV_ZERO")
!     '("log-neg" "GTK_PLOT_ERROR_LOG_NEG")
!   )
! )
! 
! (define-enum PlotOrientation
!   (in-module "Gtk")
!   (c-name "GtkPlotOrientation")
!   (gtype-id "GTK_TYPE_PLOT_ORIENTATION")
!   (values
!     '("x" "GTK_PLOT_AXIS_X")
!     '("y" "GTK_PLOT_AXIS_Y")
!     '("z" "GTK_PLOT_AXIS_Z")
!   )
! )
! 
! (define-enum PlotAxisPos
!   (in-module "Gtk")
!   (c-name "GtkPlotAxisPos")
!   (gtype-id "GTK_TYPE_PLOT_AXIS_POS")
!   (values
!     '("left" "GTK_PLOT_AXIS_LEFT")
!     '("right" "GTK_PLOT_AXIS_RIGHT")
!     '("top" "GTK_PLOT_AXIS_TOP")
!     '("bottom" "GTK_PLOT_AXIS_BOTTOM")
!   )
! )
! 
! (define-enum PlotLabelStyle
!   (in-module "Gtk")
!   (c-name "GtkPlotLabelStyle")
!   (gtype-id "GTK_TYPE_PLOT_LABEL_STYLE")
!   (values
!     '("float" "GTK_PLOT_LABEL_FLOAT")
!     '("exp" "GTK_PLOT_LABEL_EXP")
!     '("pow" "GTK_PLOT_LABEL_POW")
!   )
! )
! 
! (define-flags PlotTicksPos
!   (in-module "Gtk")
!   (c-name "GtkPlotTicksPos")
!   (gtype-id "GTK_TYPE_PLOT_TICKS_POS")
!   (values
!     '("none" "GTK_PLOT_TICKS_NONE")
!     '("in" "GTK_PLOT_TICKS_IN")
!     '("out" "GTK_PLOT_TICKS_OUT")
!   )
! )
! 
! (define-enum SheetAttrType
!   (in-module "Gtk")
!   (c-name "GtkSheetAttrType")
!   (gtype-id "GTK_TYPE_SHEET_ATTR_TYPE")
!   (values
!     '("foreground" "GTK_SHEET_FOREGROUND")
!     '("background" "GTK_SHEET_BACKGROUND")
!     '("font" "GTK_SHEET_FONT")
!     '("justification" "GTK_SHEET_JUSTIFICATION")
!     '("border" "GTK_SHEET_BORDER")
!     '("border-color" "GTK_SHEET_BORDER_COLOR")
!     '("is-editable" "GTK_SHEET_IS_EDITABLE")
!     '("is-visible" "GTK_SHEET_IS_VISIBLE")
!   )
! )
! 
  
  ;; From /usr/include/gtk-2.0/gtkextra/gtkbordercombo.h
--- 5,10 ----
  ;; Then merge old defs with new defs with mergedefs.py (for fields)
  
! (include "gtkextra-types.defs")
! (include "gtkextra-addons.defs")
  
  ;; From /usr/include/gtk-2.0/gtkextra/gtkbordercombo.h
***************
*** 2074,2078 ****
      '("gint" "width")
      '("gint" "height")
!     '("gdouble" "magnification")
    )
  )
--- 1570,1574 ----
      '("gint" "width")
      '("gint" "height")
!     '("gdouble" "magnification" (default "1.0"))
    )
  )
***************
*** 2270,2278 ****
      '("gdouble" "x")
      '("gdouble" "y")
!     '("const-gchar*" "font")
      '("gint" "height")
      '("gint" "angle")
!     '("const-GdkColor*" "fg")
!     '("const-GdkColor*" "bg")
      '("gboolean" "transparent")
      '("GtkJustification" "justification")
--- 1766,1774 ----
      '("gdouble" "x")
      '("gdouble" "y")
!     '("const-gchar*" "font" (null-ok) (default "NULL"))
      '("gint" "height")
      '("gint" "angle")
!     '("const-GdkColor*" "fg" (null-ok) (default "NULL"))
!     '("const-GdkColor*" "bg" (null-ok) (default "NULL"))
      '("gboolean" "transparent")
      '("GtkJustification" "justification")
***************
*** 3436,3440 ****
    (return-type "GtkWidget*")
    (parameters
!     '("GdkDrawable*" "drawable")
    )
  )
--- 2932,2936 ----
    (return-type "GtkWidget*")
    (parameters
!     '("GdkDrawable*" "drawable" (default "NULL"))
    )
  )
***************
*** 4381,4388 ****
    (return-type "none")
    (parameters
!     '("const-gchar*" "font")
      '("gint" "height")
!     '("const-GdkColor*" "foreground")
!     '("const-GdkColor*" "background")
    )
  )
--- 3877,3884 ----
    (return-type "none")
    (parameters
!     '("const-gchar*" "font" (null-ok) (default "NULL"))
      '("gint" "height")
!     '("const-GdkColor*" "foreground" (null-ok) (default "NULL"))
!     '("const-GdkColor*" "background" (null-ok) (default "NULL"))
    )
  )
***************
*** 4758,4775 ****
  ;; From /usr/include/gtk-2.0/gtkextra/gtkplotprint.h
  
- (define-method export_ps_with_size
-   (of-object "GtkPlot")
-   (c-name "gtk_plot_export_ps_with_size")
-   (return-type "gboolean")
-   (parameters
-     '("char*" "file_name")
-     '("gint" "orient")
-     '("gint" "epsflag")
-     '("gint" "units")
-     '("gint" "width")
-     '("gint" "height")
-   )
- )
- 
  (define-method export_ps
    (of-object "GtkPlotCanvas")
--- 4254,4257 ----
***************
*** 4789,4798 ****
    (return-type "gboolean")
    (parameters
!     '("char*" "file_name")
!     '("gint" "orient")
!     '("gint" "epsflag")
!     '("gint" "units")
!     '("gint" "width")
!     '("gint" "height")
    )
  )
--- 4271,4281 ----
    (return-type "gboolean")
    (parameters
!     '("gchar*" "file_name")
!     '("gint" "orient" (default "GTK_PLOT_PORTRAIT"))
!     '("gint" "eps" (default "FALSE"))
!     '("gint" "units" (default "GTK_PLOT_PSPOINTS"))
!     '("gint" "width" (default "GTK_PLOT_LETTER_W"))
!     '("gint" "height" (default "GTK_PLOT_LETTER_H"))
! 
    )
  )
***************
*** 5284,5288 ****
    (of-object "GtkPSFont")
    (c-name "gtk_psfont_get_psfontname")
!   (return-type "gchar*")
  )
  
--- 4767,4772 ----
    (of-object "GtkPSFont")
    (c-name "gtk_psfont_get_psfontname")
!   ;;FIXME (return-type "gchar*")
!   (return-type "const-gchar*")
  )
  

Index: gtkextra.override
===================================================================
RCS file: /cvsroot/python-gtkextra/python-gtkextra2/gtkextra/gtkextra.override,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** gtkextra.override	10 Jul 2002 19:07:02 -0000	1.1.1.1
--- gtkextra.override	11 Jul 2002 19:17:44 -0000	1.2
***************
*** 1,3 ****
- /* This is top */
  /* -*- Mode: C; c-basic-offset: 4 -*- */
  %%
--- 1,2 ----
***************
*** 18,24 ****
--- 17,55 ----
  #define GTK_TYPE_TOGGLE_COMBO (gtk_toggle_combo_get_type())
  
+ /* Hack boxed types. Just enought to let code generator compile. Not perfectly correct! */
+ //GType   gtk_psfont_get_type (void) G_GNUC_CONST;
+ #define GTK_TYPE_PSFONT (gtk_psfont_get_type ())
+ static GType
+ gtk_psfont_get_type (void)
+ {
+   static GType our_type = 0;
+   
+   if (our_type == 0)
+     our_type = g_pointer_type_register_static ("GtkPSFont");
+ 
+   return our_type;
+ }
+ 
+ #if 0
+ //GType   gtk_plot_canvas_child_get_type (void) G_GNUC_CONST;
+ #define GTK_TYPE_PLOT_CANVAS_CHILD (gtk_plot_canvas_child_get_type ())
+ static GType
+ gtk_plot_canvas_child_get_type (void)
+ {
+   static GType our_type = 0;
+   
+   if (our_type == 0)
+     our_type = g_pointer_type_register_static ("GtkPlotCanvasChild");
+ 
+   return our_type;
+ }
+ #endif
+ 
  /* This one is probably an "error" in h2def.py */
  #define GTK_PLOT3_D GTK_PLOT3D
  
+ guint16 gtk_plot_canvas_set_flags(GtkPlotCanvas *canvas, guint16 flags) { return GTK_PLOT_CANVAS_SET_FLAGS(canvas, flags); }
+ guint16 gtk_plot_canvas_unset_flags(GtkPlotCanvas *canvas, guint16 flags) { return GTK_PLOT_CANVAS_UNSET_FLAGS(canvas, flags); }
+ 
  %%
  modulename gtkextra
***************
*** 39,45 ****
  import gtk._gtk.HBox as PyGtkHBox_Type
  
  
  %%
! #ignore-glob *_get_type
  %%
  ignore
--- 70,106 ----
  import gtk._gtk.HBox as PyGtkHBox_Type
  
+ %%
+ override gtk_psfont_get_char_size
+ static PyObject *
+ _wrap_gtk_psfont_get_char_size(PyObject *self)
+ {
+     PyErr_SetString(PyExc_NotImplementedError, __FUNCTION__ );
+     return NULL;
+ }
  
  %%
! override-attr GtkPlotCanvasChild.data
! static PyObject *
! _wrap_gtk_plot_canvas_child__get_data(PyObject *self, void *closure)
! {
!     // FIXME
!     switch (pyg_pointer_get(self, GtkPlotCanvasChild)->type) {
!     case GTK_PLOT_CANVAS_NONE:
! 	Py_INCREF(Py_None);
! 	return Py_None;
! #if 0
!     case GTK_PLOT_CANVAS_PLOT:
!     case GTK_PLOT_CANVAS_DATA:
!     case GTK_PLOT_CANVAS_LEGENDS:
!     case GTK_PLOT_CANVAS_TEXT:
! 	return pygobject_new((GObject *)(pyg_pointer_get(self, GtkPlotCanvasChild)->data));
! #endif
!     default:
! 	return PyCObject_FromVoidPtr(pyg_pointer_get(self, GtkPlotCanvasChild)->data, NULL);
!     }
! }
! 
! %%
! ignore-glob *_get_type
  %%
  ignore
***************
*** 48,53 ****
    gtkextra_check_version
    gtk_plot_dt_set_quadtrilateral
- 
- 
- 
- 
--- 109,110 ----

Index: gtkextramodule.c
===================================================================
RCS file: /cvsroot/python-gtkextra/python-gtkextra2/gtkextra/gtkextramodule.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** gtkextramodule.c	10 Jul 2002 19:07:02 -0000	1.1.1.1
--- gtkextramodule.c	11 Jul 2002 19:17:44 -0000	1.2
***************
*** 7,12 ****
--- 7,15 ----
  #include <pygobject.h>
  #include <pygtk/pygtk.h>
+ #include <gtkextra/gtkextra.h>
  
  void pygtkextra_register_classes(PyObject *d);
+ void pygtkextra_add_constants(PyObject *module, const gchar *strip_prefix);
+ 
  extern PyMethodDef pygtkextra_functions[];
  
***************
*** 24,27 ****
--- 27,41 ----
  
      pygtkextra_register_classes(d);
+     pygtkextra_add_constants(m, "GTK_");
+ 
+     PyModule_AddIntConstant(m, "PLOT_LETTER_W", GTK_PLOT_LETTER_W);
+     PyModule_AddIntConstant(m, "PLOT_LETTER_H", GTK_PLOT_LETTER_H);
+     PyModule_AddIntConstant(m, "PLOT_LEGAL_W", GTK_PLOT_LEGAL_W);
+     PyModule_AddIntConstant(m, "PLOT_LEGAL_H", GTK_PLOT_LEGAL_H);
+     PyModule_AddIntConstant(m, "PLOT_A4_W", GTK_PLOT_A4_W);
+     PyModule_AddIntConstant(m, "PLOT_A4_H", GTK_PLOT_A4_H);
+     PyModule_AddIntConstant(m, "PLOT_EXECUTIVE_W", GTK_PLOT_EXECUTIVE_W);
+     PyModule_AddIntConstant(m, "PLOT_EXECUTIVE_H", GTK_PLOT_EXECUTIVE_H);
+     PyModule_AddIntConstant(m, "PLOT_CANVAS_DND_FLAGS", GTK_PLOT_CANVAS_DND_FLAGS);
  
      if (PyErr_Occurred())