Subject: [pygtk] Rename gtk.Statusbar.remove() to gtk.Statusbar.remove_message() - msg#05351List: svn-commits-listAuthor: Paul Pogonyshev <pogonyshev@xxxxxxx> Date: Sat May 2 18:38:10 2009 +0300 Rename gtk.Statusbar.remove() to gtk.Statusbar.remove_message() Avoids hiding gtk.Container method with the same name. It is still possible to use remove() to operate on messages, but in this case there will be a deprecation warning. Fixes bug #564587. docs/reference/pygtk-gtkstatusbar.xml | 35 +++++++++++++++--- gtk/Makefile.am | 1 + gtk/gtk-base.defs | 13 +++++++ gtk/gtk.override | 1 + gtk/gtkstatusbar.override | 65 +++++++++++++++++++++++++++++++++ 5 files changed, 110 insertions(+), 5 deletions(-) --- diff --git a/docs/reference/pygtk-gtkstatusbar.xml b/docs/reference/pygtk-gtkstatusbar.xml index fc82f68..d1e63e0 100644 --- a/docs/reference/pygtk-gtkstatusbar.xml +++ b/docs/reference/pygtk-gtkstatusbar.xml @@ -46,6 +46,14 @@ linkend="method-gtkstatusbar--pop">pop</link></methodname> </methodsynopsis> <methodsynopsis language="python"> <methodname><link +linkend="method-gtkstatusbar--remove-message">remove_message</link></methodname> + <methodparam><parameter + role="keyword">context_id</parameter></methodparam> + <methodparam><parameter + role="keyword">message_id</parameter></methodparam> + </methodsynopsis> + <methodsynopsis language="python"> + <methodname><link linkend="method-gtkstatusbar--remove">remove</link></methodname> <methodparam><parameter role="keyword">context_id</parameter></methodparam> @@ -310,7 +318,7 @@ identifier</simpara></listitem> specified by <parameter>text</parameter> with the specified <parameter>context_id</parameter> onto a statusbar's stack and returns a message id that that can be used with the <link -linkend="method-gtkstatusbar--remove"><methodname>remove</methodname>()</link> +linkend="method-gtkstatusbar--remove-message"><methodname>remove_message</methodname>()</link> method.</para> </refsect2> @@ -337,11 +345,11 @@ statusbar's stack.</para> </refsect2> - <refsect2 id="method-gtkstatusbar--remove"> - <title>gtk.Statusbar.remove</title> + <refsect2 id="method-gtkstatusbar--remove-message"> + <title>gtk.Statusbar.remove_message</title> <programlisting><methodsynopsis language="python"> - <methodname>remove</methodname> + <methodname>remove_message</methodname> <methodparam><parameter role="keyword">context_id</parameter></methodparam> <methodparam><parameter @@ -360,12 +368,29 @@ role="keyword">message_id</parameter> :</term> </varlistentry> </variablelist> - <para>The <methodname>remove</methodname>() method removes the message + <para>The <methodname>remove_message</methodname>() method removes the message with the specified <parameter>message_id</parameter> and <parameter>context_id</parameter> from the statusbar's message stack.</para> </refsect2> + <refsect2 id="method-gtkstatusbar--remove"> + <title>gtk.Statusbar.remove</title> + + <warning> + <para>This method is deprecated in PyGTK 2.18 and above</para> + </warning> + + <para>This method calls either + <link linkend="method-gtkcontainer--remove">gtk.Container.remove</link> + or <link linkend="method-gtkstatusbar--remove-message">gtk.Statusbar.remove_message</link> + depending on parameters. The second option is for compatibility only and will be + eventually removed. New code should use <literal>remove</literal> only to remove + widgets (as in <literal>gtk.Container</literal> method). To remove messages, use + <link linkend="method-gtkstatusbar--remove-message">gtk.Statusbar.remove_message</link> + directly.</para> + </refsect2> + <refsect2 id="method-gtkstatusbar--set-has-resize-grip"> <title>gtk.Statusbar.set_has_resize_grip</title> diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 690a6aa..5b30fa7 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -109,6 +109,7 @@ GTK_OVERRIDES = \ gtkctree.override \ gtkiconview.override \ gtkrcstyle.override \ + gtkstatusbar.override \ gtkstyle.override \ gtktextview.override \ gtktoolbar.override \ diff --git a/gtk/gtk-base.defs b/gtk/gtk-base.defs index cd8feda..60730d7 100644 --- a/gtk/gtk-base.defs +++ b/gtk/gtk-base.defs @@ -16589,8 +16589,21 @@ ) ) +;; Weird c-name is not used, it is overriden. See the next entry. (define-method remove (of-object "GtkStatusbar") + (c-name "gtk_statusbar_remove_compatibility") + (return-type "none") + (parameters + '("guint" "context_id") + '("guint" "message_id") + ) + (deprecated "use gtk.Statusbar.remove_message") +) + +;; Renamed because it hides gtk.Container.remove, see bug #564587. +(define-method remove_message + (of-object "GtkStatusbar") (c-name "gtk_statusbar_remove") (return-type "none") (parameters diff --git a/gtk/gtk.override b/gtk/gtk.override index a289489..3fb6fd5 100644 --- a/gtk/gtk.override +++ b/gtk/gtk.override @@ -137,6 +137,7 @@ include gtkctree.override gtkiconview.override gtkrcstyle.override + gtkstatusbar.override gtkstyle.override gtktextview.override gtktoolbar.override diff --git a/gtk/gtkstatusbar.override b/gtk/gtkstatusbar.override new file mode 100644 index 0000000..2c202c4 --- /dev/null +++ b/gtk/gtkstatusbar.override @@ -0,0 +1,65 @@ +/* -*- Mode: C; c-basic-offset: 4 -*- + * pygtk- Python bindings for the GTK toolkit. + * Copyright (C) 2009 Paul Pogonyshev + * + * gtkstatusbar.override: overrides for the gtk.Statusbar object. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +%% +override gtk_statusbar_remove_compatibility kwargs + +static PyObject * +_wrap_gtk_statusbar_remove(PyGObject *self, PyObject *args, PyObject *kwargs); + +static PyObject * +_wrap_gtk_statusbar_remove_compatibility(PyGObject *self, PyObject *args, PyObject *kwargs) +{ + static char *kwlist[] = { "widget", NULL }; + PyGObject *widget; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:gtk.Statusbar.remove", kwlist, + &PyGtkWidget_Type, &widget)) { + PyObject *exc_type, *exc_value, *exc_traceback; + PyObject *result; + + PyErr_Fetch(&exc_type, &exc_value, &exc_traceback); + + /* For compatibility reasons, call remove_message(). See bug #564587. */ + result = _wrap_gtk_statusbar_remove(self, args, kwargs); + if (result) { + Py_XDECREF(exc_type); + Py_XDECREF(exc_value); + Py_XDECREF(exc_traceback); + + if (PyErr_Warn(PyExc_DeprecationWarning, "use gtk.Statusbar.remove_message")) { + Py_DECREF(result); + return NULL; + } + + return result; + } + else { + PyErr_Restore(exc_type, exc_value, exc_traceback); + return NULL; + } + } + + gtk_container_remove(GTK_CONTAINER(self->obj), GTK_WIDGET(widget->obj)); + + Py_INCREF(Py_None); + return Py_None; +} _______________________________________________ SVN-commits-list mailing list (read only) http://mail.gnome.org/mailman/listinfo/svn-commits-list Want to limit the commits to a few modules? Go to above URL, log in to edit your options and select the modules ('topics') you want.
Thread at a glance:
Previous Message by Date: (click to view message preview)[rep-gtk] began adding gtk+ 2.12 api -- see ChangeLog for (much) more infoscommit a0a0272f9b18daa6f9086db810667a4724943524 Author: chrisb <zanghar@xxxxxxxxxx> Date: Sat Jun 20 00:26:40 2009 +0200 began adding gtk+ 2.12 api -- see ChangeLog for (much) more infos ChangeLog | 88 ++++++++++++++-- config.guess | 28 ++++- config.sub | 37 +++++-- gcb.patch | 46 ++++++++ gtk.defs | 339 ++++++++++++++++++++++++++++++++------------------------- 5 files changed, 365 insertions(+), 173 deletions(-) --- diff --git a/ChangeLog b/ChangeLog index a63babf..13cab3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,76 @@ * configure.in: 0.18.6 released, bump to 0.90.0, bump minimal required gtk+ version to 2.12 (as I'll update the rep-gtk API to that version) + * gtk.defs: gtk+ 2.12 API added: + *********** gtkenums.h *********** + GtkArrowType >> none (GTK_ARROW_NONE) + GtkButtonBoxStyle >> center (GTK_BUTTONBOX_CENTER) + GtkSensitivityType >> auto (GTK_SENSITIVITY_AUTO) + GtkSensitivityType >> on (GTK_SENSITIVITY_ON) + GtkSensitivityType >> off (GTK_SENSITIVITY_OFF) + GtkMovementStep >> horizontal-pages (GTK_MOVEMENT_HORIZONTAL_PAGES) + GtkScrollStep >> steps (GTK_SCROLL_STEPS) + GtkScrollStep >> pages (GTK_SCROLL_PAGES) + GtkScrollStep >> ends (GTK_SCROLL_ENDS) + GtkScrollStep >> horizontal-steps (GTK_SCROLL_HORIZONTAL_STEPS) + GtkScrollStep >> horizontal-pages (GTK_SCROLL_HORIZONTAL_PAGES) + GtkScrollStep >> horizontal-ends (GTK_SCROLL_HORIZONTAL_ENDS) + GtkScrollType >> page-left (GTK_SCROLL_PAGE_LEFT) + GtkScrollType >> page-right (GTK_SCROLL_PAGE_RIGHT) + GtkWarpMode >> word-char (GTK_WRAP_WORD_CHAR) + GtkIMPreeditStyle >> nothing (GTK_IM_PREEDIT_NOTHING) + GtkIMPreeditStyle >> callback (GTK_IM_PREEDIT_CALLBACK) + GtkIMPreeditStyle >> none (GTK_IM_PREEDIT_NONE) + GtkIMStatusStyle >> nothing (GTK_IM_STATUS_NOTHING) + GtkIMStatusStyle >> callback (GTK_IM_STATUS_CALLBACK) + GtkIMStatusStyle >> none (GTK_IM_STATUS_NONE) + GtkPackDirection >> rtl (GTK_PACK_DIRECTION_RTL) + GtkPackDirection >> ltr (GTK_PACK_DIRECTION_LTR) + GtkPackDirection >> ttb (GTK_PACK_DIRECTION_TTB) + GtkPackDirection >> btt (GTK_PACK_DIRECTION_BTT) + GtkPrintPages >> all (GTK_PRINT_PAGES_ALL) + GtkPrintPages >> current (GTK_PRINT_PAGES_CURRENT) + GtkPrintPages >> ranges (GTK_PRINT_PAGES_RANGES) + GtkPageSet >> all (GTK_PAGE_SET_ALL) + GtkPageSet >> even (GTK_PAGE_SET_EVEN) + GtkPageSet >> odd (GTK_PAGE_SET_ODD) + GtkPageOrientation >> portrait (GTK_PAGE_ORIENTATION_PORTRAIT) + GtkPageOrientation >> landscape (GTK_PAGE_ORIENTATION_LANDSCAPE) + GtkPageOrientation >> reverse-portrait (GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT) + GtkPageOrientation >> reverse-landscape (GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE) + GtkPrintQuality >> low (GTK_PRINT_QUALITY_LOW) + GtkPrintQuality >> normal (GTK_PRINT_QUALITY_NORMAL) + GtkPrintQuality >> high (GTK_PRINT_QUALITY_HIGH) + GtkPrintQuality >> draft (GTK_PRINT_QUALITY_DRAFT) + GtkUnit >> pixl (GTK_UNIT_PIXEL) + GtkUnit >> points (GTK_UNIT_POINTS) + GtkUnit >> inch (GTK_UNIT_INCH) + GtkUnit >> mm (GTK_UNIT_MM) + GtkTreeViewGridLines >> none (GTK_TREE_VIEW_GRID_LINES_NONE) + GtkTreeViewGridLines >> horizontal (GTK_TREE_VIEW_GRID_LINES_HORIZONTAL) + GtkTreeViewGridLines >> vertical (GTK_TREE_VIEW_GRID_LINES_VERTICAL) + GtkTreeViewGridLines >> both (GTK_TREE_VIEW_GRID_LINES_BOTH) + GtkDragResult >> success (GTK_DRAG_RESULT_SUCCESS) + GtkDragResult >> no-target (GTK_DRAG_RESULT_NO_TARGET) + GtkDragResult >> user-cancelled (GTK_DRAG_RESULT_USER_CANCELLED) + GtkDragResult >> timeout-expired (GTK_DRAG_RESULT_TIMEOUT_EXPIRED) + GtkDragResult >> grab-broken (GTK_DRAG_RESULT_GRAB_BROKEN) + GtkDragResult >> error (GTK_DRAG_RESULT_ERROR) + *********** gtkcolorbutton.h *********** + Implemented new widget: GtkColorButton + + * gtk.defs: deprecated API removed: + GtkSignalRunType >> completely + GtkSubMenuDirection >> completely + GtkSubMenuPlacement >> completely + + * gtk.defs: deprecated API replaced: + GtkPreview* >> GtkColorButton + (apply the included gcb.patch to make sawfish-ui work with this change!) + + * gcb.patch: patch for sawfish, to make sawfish-ui work with the new GtkColorButton + instead of GtkPreview (which has been removed from rep-gtk now) + 2009-05-06 Christopher Bratusek <zanghar@xxxxxxxxxx> * rep-gtk.spec.in: - require gtk2 instead of gtk+ - add --libdir=%{_libdir} to configure flags @@ -32,17 +102,17 @@ 2009-03-04 Christopher Bratusek <zanghar@xxxxxxxxxx> * configure.in: 0.18.4 released, bump to 0.18.5 bump minimum gtk+ to 2.15.5 - + * gtk.defs: - - [ - ~ = not completely implemented - * = completely implemented - ^ not completely removed - # to implement low priority - ! to remove high priority + + [ + ~ = not completely implemented + * = completely implemented + ^ not completely removed + # to implement low priority + ! to remove high priority ] - + > implemented new stuff: - GtkArrowPlacement ~ - GtkArrowType -> none (= GTK_ARROW_NONE) * diff --git a/config.guess b/config.guess index f32079a..7b24a87 100755 --- a/config.guess +++ b/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2008-01-23' +timestamp='2008-11-15' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -331,7 +331,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if echo '\n#ifdef __amd64\nIS_64BIT_ARCH\n#endif' | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -796,7 +809,7 @@ EOF x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd) + EM64T | authenticamd | genuineintel) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -935,6 +948,9 @@ EOF if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -985,9 +1001,6 @@ EOF a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. @@ -1216,6 +1229,9 @@ EOF BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; diff --git a/config.sub b/config.sub index 6759825..053e738 100755 --- a/config.sub +++ b/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2008-01-16' +timestamp='2008-09-08' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -250,12 +250,14 @@ case $basic_machine in | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep \ + | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ @@ -286,7 +288,7 @@ case $basic_machine in | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) + | z8k | z80) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -331,12 +333,14 @@ case $basic_machine in | ip2k-* | iq2000-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ @@ -364,14 +368,14 @@ case $basic_machine in | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) ;; # Recognize the basic CPU types without company name, with glob match. xtensa*) @@ -459,6 +463,10 @@ case $basic_machine in basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -526,6 +534,10 @@ case $basic_machine in basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp @@ -1128,6 +1140,10 @@ case $basic_machine in basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -1248,7 +1264,7 @@ case $os in | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ + | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1388,6 +1404,9 @@ case $os in -zvmoe) os=-zvmoe ;; + -dicos*) + os=-dicos + ;; -none) ;; *) diff --git a/gcb.patch b/gcb.patch new file mode 100644 index 0000000..1d842f9 --- /dev/null +++ b/gcb.patch @@ -0,0 +1,46 @@ +diff --git a/lisp/sawfish/gtk/color-preview.jl b/lisp/sawfish/gtk/color-preview.jl +index f83120e..20eb9bc 100644 +--- a/lisp/sawfish/gtk/color-preview.jl ++++ b/lisp/sawfish/gtk/color-preview.jl +@@ -32,7 +32,7 @@ + (defconst color-preview-width 28) + (defconst color-preview-height 16) + +- (define (set-preview-color preview color) ++ (define (set-preview-color color-button color) + (let ((buf (make-string (* color-preview-width 3)))) + (let ((red (quotient (gdk-color-red color) 256)) + (green (quotient (gdk-color-green color) 256)) +@@ -43,24 +43,24 @@ + (aset buf (1+ (* i 3)) green) + (aset buf (+ 2 (* i 3)) blue))) + (do ((i 0 (1+ i))) +- ((= i color-preview-height)) +- (gtk-preview-draw-row preview buf 0 i color-preview-width)))) ++ ((= i color-preview-height))))) ++ ++;; XXX Fixme: Use a Vbox as container instead of another Button + + (define (button-new-with-color color-name) + (let ((button (gtk-button-new)) +- (preview (gtk-preview-new 'color)) ++ (color-button (gtk-color-button-new 'color)) + (color (and color-name (gdk-color-parse-interp color-name)))) +- (gtk-preview-size preview color-preview-width color-preview-height) + (when color +- (set-preview-color preview color)) +- (gtk-container-add button preview) ++ (gtk-color-button-set-color color-button color)) ++ (gtk-container-add button color-button) + button)) + + (define (set-button-color button color-name) + (let ((color (and color-name (gdk-color-parse-interp color-name)))) + (when color + (mapc (lambda (w) +- (when (gtk-preview-p w) +- (set-preview-color w color) ++ (when (gtk-color-button-p w) ++ (gtk-color-button-set-color w color) + (gtk-widget-draw-interp w))) + (gtk-container-get-children button)))))) diff --git a/gtk.defs b/gtk.defs index f79a09d..622d336 100644 --- a/gtk.defs +++ b/gtk.defs @@ -41,7 +41,8 @@ (up GTK_ARROW_UP) (down GTK_ARROW_DOWN) (left GTK_ARROW_LEFT) - (right GTK_ARROW_RIGHT)) + (right GTK_ARROW_RIGHT) + (none GTK_ARROW_NONE)) (define-flags GtkAttachOptions (expand GTK_EXPAND) @@ -53,7 +54,8 @@ (spread GTK_BUTTONBOX_SPREAD) (edge GTK_BUTTONBOX_EDGE) (start GTK_BUTTONBOX_START) - (end GTK_BUTTONBOX_END)) + (end GTK_BUTTONBOX_END) + (center GTK_BUTTONBOX_CENTER)) (define-enum GtkCurveType (linear GTK_CURVE_TYPE_LINEAR) @@ -98,6 +100,11 @@ (ltr GTK_TEXT_DIR_LTR) (rtl GTK_TEXT_DIR_RTL)) +(define-enum GtkSensitivityType + (auto GTK_SENSITIVITY_AUTO) + (on GTK_SENSITIVITY_ON) + (off GTK_SENSITIVITY_OFF)) + (define-enum GtkJustification (left GTK_JUSTIFY_LEFT) (right GTK_JUSTIFY_RIGHT) @@ -124,7 +131,16 @@ (paragraph-ends GTK_MOVEMENT_PARAGRAPH_ENDS) (paragraphs GTK_MOVEMENT_PARAGRAPHS) (pages GTK_MOVEMENT_PAGES) - (buffer-ends GTK_MOVEMENT_BUFFER_ENDS)) + (buffer-ends GTK_MOVEMENT_BUFFER_ENDS) + (horizontal-pages GTK_MOVEMENT_HORIZONTAL_PAGES)) + +(define-enum GtkScrollStep + (steps GTK_SCROLL_STEPS) + (pages GTK_SCROLL_PAGES) + (ends GTK_SCROLL_ENDS) + (horizontal-steps GTK_SCROLL_HORIZONTAL_STEPS) + (horizontal-pages GTK_SCROLL_HORIZONTAL_PAGES) + (horizontal-ends GTK_SCROLL_HORIZONTAL_ENDS)) (define-enum GtkOrientation (horizontal GTK_ORIENTATION_HORIZONTAL) @@ -164,11 +180,6 @@ (top GTK_POS_TOP) (bottom GTK_POS_BOTTOM)) -;; XXX deprecated -(define-enum GtkPreviewType - (color GTK_PREVIEW_COLOR) - (grayscale GTK_PREVIEW_GRAYSCALE)) - (define-enum GtkReliefStyle (normal GTK_RELIEF_NORMAL) (half GTK_RELIEF_HALF) @@ -179,15 +190,6 @@ (queue GTK_RESIZE_QUEUE) (immediate GTK_RESIZE_IMMEDIATE)) -;; XXX deprecated -(define-flags GtkSignalRunType - (first GTK_RUN_FIRST) - (last GTK_RUN_LAST) - (both GTK_RUN_BOTH) - (no-recurse GTK_RUN_NO_RECURSE) - (action GTK_RUN_ACTION) - (no-hooks GTK_RUN_NO_HOOKS)) - (define-enum GtkScrollType (none GTK_SCROLL_NONE) (jump GTK_SCROLL_JUMP) @@ -201,6 +203,8 @@ (page-down GTK_SCROLL_PAGE_DOWN) (step-left GTK_SCROLL_STEP_LEFT) (step-right GTK_SCROLL_STEP_RIGHT) + (page-left GTK_SCROLL_PAGE_LEFT) + (page-right GTK_SCROLL_PAGE_RIGHT) (start GTK_SCROLL_START) (end GTK_SCROLL_END)) @@ -224,14 +228,6 @@ (selected GTK_STATE_SELECTED) (insensitive GTK_STATE_INSENSITIVE)) -;; XXX deprecated -(define-enum GtkSubmenuDirection - (left GTK_DIRECTION_LEFT) - (right GTK_DIRECTION_RIGHT)) -(define-enum GtkSubmenuPlacement - (top-bottom GTK_TOP_BOTTOM) - (left-right GTK_LEFT_RIGHT)) - (define-enum GtkToolbarStyle (icons GTK_TOOLBAR_ICONS) (text GTK_TOOLBAR_TEXT) @@ -262,12 +258,71 @@ (define-enum GtkWrapMode (none GTK_WRAP_NONE) (char GTK_WRAP_CHAR) - (word GTK_WRAP_WORD)) + (word GTK_WRAP_WORD) + (word-char GTK_WRAP_WORD_CHAR)) (define-enum GtkSortType (ascending GTK_SORT_ASCENDING) (descending GTK_SORT_DESCENDING)) +(define-enum GtkIMPreeditStyle + (nothing GTK_IM_PREEDIT_NOTHING) + (callback GTK_IM_PREEDIT_CALLBACK) + (none GTK_IM_PREEDIT_NONE)) + +(define-enum GtkIMStatusStyle + (nothing GTK_IM_STATUS_NOTHING) + (callback GTK_IM_STATUS_CALLBACK) + (none GTK_IM_STATUS_NONE)) + +(define-enum GtkPackDirection + (rtl GTK_PACK_DIRECTION_RTL) + (ltr GTK_PACK_DIRECTION_LTR) + (ttb GTK_PACK_DIRECTION_TTB) + (btt GTK_PACK_DIRECTION_BTT)) + +(define-enum GtkPrintPages + (all GTK_PRINT_PAGES_ALL) + (current GTK_PRINT_PAGES_CURRENT) + (ranges GTK_PRINT_PAGES_RANGES)) + +(define-enum GtkPageSet + (all GTK_PAGE_SET_ALL) + (even GTK_PAGE_SET_EVEN) + (odd GTK_PAGE_SET_ODD)) + +(define-enum GtkPageOrientation + (portrait GTK_PAGE_ORIENTATION_PORTRAIT) + (landscape GTK_PAGE_ORIENTATION_LANDSCAPE) + (reverse-portrait GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT) + (reverse-landscape GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE)) + +(define-enum GtkPrintQuality + (low GTK_PRINT_QUALITY_LOW) + (normal GTK_PRINT_QUALITY_NORMAL) + (high GTK_PRINT_QUALITY_HIGH) + (draft GTK_PRINT_QUALITY_DRAFT)) + +(define-enum GtkUnit + (pixel GTK_UNIT_PIXEL) + (points GTK_UNIT_POINTS) + (inch GTK_UNIT_INCH) + (mm GTK_UNIT_MM)) + +(define-enum GtkTreeViewGridLines + (none GTK_TREE_VIEW_GRID_LINES_NONE) + (horizontal GTK_TREE_VIEW_GRID_LINES_HORIZONTAL) + (vertical GTK_TREE_VIEW_GRID_LINES_VERTICAL) + (both GTK_TREE_VIEW_GRID_LINES_BOTH)) + +(define-enum GtkDragResult + (success GTK_DRAG_RESULT_SUCCESS) + (no-target GTK_DRAG_RESULT_NO_TARGET) + (user-cancelled GTK_DRAG_RESULT_USER_CANCELLED) + (timeout-expired GTK_DRAG_RESULT_TIMEOUT_EXPIRED) + (grab-broken GTK_DRAG_RESULT_GRAB_BROKEN) + (error GTK_DRAG_RESULT_ERROR)) + ;(define-enum GtkMenuFactoryType ; (menu GTK_MENU_FACTORY_MENU) ; (menu-bar GTK_MENU_FACTORY_MENU_BAR) @@ -377,7 +432,7 @@ (no-month-changed GTK_CALENDAR_NO_MONTH_CHANGE) (show-week-numbers GTK_CALENDAR_SHOW_WEEK_NUMBERS) (week-start-monday GTK_CALENDAR_WEEK_START_MONDAY)) - + ;;; Gtk boxed types (define-object GtkWidget (GtkObject) @@ -407,7 +462,7 @@ ;;; Functions -;; +;; ;; gtkmain.h @@ -953,7 +1008,7 @@ ((GtkContainer container))) ;; XXX this is deprecated? -(define-func gtk_container_foreach_full +(define-func gtk_container_foreach_full none ((GtkContainer container) (full-callback function (protect-during))) @@ -980,7 +1035,7 @@ GtkWidget ()) -(define-func gtk_fixed_put +(define-func gtk_fixed_put none ((GtkFixed fixed) (GtkWidget widget) @@ -1044,7 +1099,7 @@ (define-object GtkTree (GtkContainer)) -(define-func gtk_tree_new +(define-func gtk_tree_new GtkWidget ()) @@ -1125,7 +1180,7 @@ (int rows) (int columns))) -(define-func gtk_clist_new +(define-func gtk_clist_new GtkWidget ((int columns))) @@ -1166,7 +1221,7 @@ ((GtkCList clist) (bool reorderable))) -(define-func gtk_clist_set_use_drag_icons +(define-func gtk_clist_set_use_drag_icons none ((GtkCList list) (bool use_icons))) @@ -1361,7 +1416,7 @@ ((GtkCList clist) (int row))) -(define-func gtk_clist_set_shift +(define-func gtk_clist_set_shift none ((GtkCList clist) (int row) @@ -1391,15 +1446,15 @@ ((GtkCList clist) ;; uhhh, this is hacky ((fvec string "((GtkCList*)sgtk_get_gtkobj (p_clist))->columns") text))) - + (define-func gtk_clist_insert int ((GtkCList clist) (int row) ;; uhhh, this is hacky ((fvec string "((GtkCList*)sgtk_get_gtkobj (p_clist))->columns") text))) - -(define-func gtk_clist_remove + +(define-func gtk_clist_remove none ((GtkCList clist) (int row))) @@ -1474,7 +1529,7 @@ (define-object GtkEventBox (GtkBin)) -(define-func gtk_event_box_new +(define-func gtk_event_box_new GtkWidget ()) @@ -1822,12 +1877,12 @@ (define-object GtkButtonBox (GtkBox)) -(define-func gtk_button_box_set_layout - none +(define-func gtk_button_box_set_layout + none ((GtkButtonBox widget) (GtkButtonBoxStyle layout_style))) -(define-func gtk_button_box_get_layout +(define-func gtk_button_box_get_layout GtkButtonBoxStyle ((GtkButtonBox widget))) @@ -1837,7 +1892,7 @@ (GtkWidget child) (bool is_secondary))) -(define-func gtk_button_box_set_child_size +(define-func gtk_button_box_set_child_size none ((GtkButtonBox widget) (int min_width) @@ -1855,7 +1910,7 @@ (define-object GtkHButtonBox (GtkButtonBox)) -(define-func gtk_hbutton_box_new +(define-func gtk_hbutton_box_new GtkWidget ()) @@ -1863,7 +1918,7 @@ (define-object GtkVButtonBox (GtkButtonBox)) -(define-func gtk_vbutton_box_new +(define-func gtk_vbutton_box_new GtkWidget ()) @@ -1880,7 +1935,7 @@ ;; (define-func gtk_toolbar_prepend_item) ;; (define-func gtk_toolbar_insert_item) ;; (define-func gtk_toolbar_insert_stock) - + (define-func gtk_toolbar_append_space none ((GtkToolbar toolbar))) @@ -2248,7 +2303,7 @@ (define-object GtkArrow (GtkWidget)) -(define-func gtk_arrow_new +(define-func gtk_arrow_new GtkWidget ((GtkArrowType arrow_type) (GtkShadowType shadow_type))) @@ -2407,11 +2462,11 @@ ;; XXX get_size (define-func gtk_layout_get_hadjustment - GtkAdjustment + GtkAdjustment ((GtkLayout layout))) (define-func gtk_layout_get_vadjustment - GtkAdjustment + GtkAdjustment ((GtkLayout layout))) (define-func gtk_layout_set_hadjustment @@ -2473,22 +2528,22 @@ (define-object GtkItem (GtkBin)) -(define-func gtk_item_select +(define-func gtk_item_select none ((GtkItem item))) -(define-func gtk_item_deselect +(define-func gtk_item_deselect none ((GtkItem item))) -(define-func gtk_item_toggle +(define-func gtk_item_toggle none ((GtkItem item))) ;;;; GtkCombo (define-object GtkCombo (GtkHBox) - (fields + (fields (GtkWidget entry) (GtkWidget button) (GtkWidget popup) @@ -2496,7 +2551,7 @@ (GtkWidget list))) (define-func gtk_combo_new - GtkWidget + GtkWidget ()) (define-func gtk_combo_set_value_in_list @@ -3291,7 +3346,7 @@ (GtkWidget child) (GtkWidget tab_label))) -(define-func gtk_notebook_append_page_menu +(define-func gtk_notebook_append_page_menu none ((GtkNotebook notebook) (GtkWidget child) @@ -3304,7 +3359,7 @@ (GtkWidget child) (GtkWidget tab_label))) -(define-func gtk_notebook_prepend_page_menu +(define-func gtk_notebook_prepend_page_menu none ((GtkNotebook notebook) (GtkWidget child) @@ -3318,7 +3373,7 @@ (GtkWidget tab_label) (int position))) -(define-func gtk_notebook_insert_page_menu +(define-func gtk_notebook_insert_page_menu none ((GtkNotebook notebook) (GtkWidget child) @@ -3385,20 +3440,20 @@ GtkPositionType ((GtkNotebook notebook))) -(define-func gtk_notebook_set_scrollable +(define-func gtk_notebook_set_scrollable none ((GtkNotebook notebook) (bool scrollable))) -(define-func gtk_notebook_get_scrollable +(define-func gtk_notebook_get_scrollable bool ((GtkNotebook notebook))) -(define-func gtk_notebook_popup_enable +(define-func gtk_notebook_popup_enable none ((GtkNotebook notebook))) - -(define-func gtk_notebook_popup_disable + +(define-func gtk_notebook_popup_disable none ((GtkNotebook notebook))) @@ -3600,28 +3655,28 @@ ((GtkAdjustment adjustment) (double climb_rate) (int digits))) - + (define-func gtk_spin_button_new_with_range GtkWidget ((double min) (double max) (double step))) -(define-func gtk_spin_button_set_adjustment +(define-func gtk_spin_button_set_adjustment none ((GtkSpinButton spin_button) (GtkAdjustment adjustment))) -(define-func gtk_spin_button_get_adjustment +(define-func gtk_spin_button_get_adjustment GtkAdjustment ((GtkSpinButton spin_button))) -(define-func gtk_spin_button_set_digits +(define-func gtk_spin_button_set_digits none ((GtkSpinButton spin_button) (int digits))) -(define-func gtk_spin_button_get_digits +(define-func gtk_spin_button_get_digits int ((GtkSpinButton spin_button))) @@ -3645,21 +3700,21 @@ double ((GtkSpinButton spin_button))) -(define-func gtk_spin_button_get_value_as_int +(define-func gtk_spin_button_get_value_as_int int ((GtkSpinButton spin_button))) -(define-func gtk_spin_button_set_value +(define-func gtk_spin_button_set_value none - ((GtkSpinButton spin_button) + ((GtkSpinButton spin_button) (double value))) -(define-func gtk_spin_button_set_update_policy +(define-func gtk_spin_button_set_update_policy none ((GtkSpinButton spin_button) (GtkSpinButtonUpdatePolicy policy))) -(define-func gtk_spin_button_get_update_policy +(define-func gtk_spin_button_get_update_policy GtkSpinButtonUpdatePolicy ((GtkSpinButton spin_button))) @@ -3719,7 +3774,7 @@ (float xscale) (float yscale))) -;; DrawingArea +;; DrawingArea (define-object GtkDrawingArea (GtkWidget)) @@ -3763,65 +3818,6 @@ ((GtkCurve curve) (GtkCurveType type))) - -;; Preview - -(define-object GtkPreview (GtkWidget)) - -(define-func gtk_preview_new - GtkWidget - ((GtkPreviewType type))) - -(define-func gtk_preview_size - none - ((GtkPreview preview) - (int width) - (int height))) - -(define-func gtk_preview_put - none - ((GtkPreview preview) - (GdkWindow window) - (GdkGC gc) - (int srcx) - (int srcy) - (int destx) - (int desty) - (int width) - (int height))) - -(define-func gtk_preview_draw_row - none - ((GtkPreview preview) - (string data) - (int x) - (int y) - (int w))) - -(define-func gtk_preview_set_expand - none - ((GtkPreview preview) - (bool expand))) - -(define-func gtk_preview_set_gamma - none - ((double gamma))) - -(define-func gtk_preview_set_color_cube - none - ((uint nred_shades) - (uint ngreen_shades) - (uint nblue_shades) - (uint ngray_shades))) - -(define-func gtk_preview_set_install_cmap - none - ((bool install_cmap))) - -(define-func gtk_preview_set_reserved - none - ((int nreserved))) - ;; FileSelection (define-object GtkFileSelection (GtkWindow) @@ -3865,14 +3861,14 @@ ;; FontSelectionDialog (define-object GtkFontSelectionDialog (GtkWindow) - (fields + (fields (GtkWidget main_vbox) (GtkWidget action_area) (GtkWidget ok_button) (GtkWidget apply_button) (GtkWidget cancel_button))) - -(define-func gtk_font_selection_dialog_new + +(define-func gtk_font_selection_dialog_new GtkWidget ((string title))) @@ -3888,12 +3884,12 @@ (define-func gtk_font_selection_dialog_get_preview_text static_string ((GtkFontSelectionDialog fontsel))) - + (define-func gtk_font_selection_dialog_set_preview_text none ((GtkFontSelectionDialog fontsel) (string text))) - + ;; ColorSelectionDialog (define-object GtkColorSelectionDialog (GtkWindow) @@ -3965,7 +3961,7 @@ ;; This returns a color which is not allocated in any colormap. (define-func gtk_color_selection_get_color_interp GdkColor - ((GtkColorSelection colorsel))) + ((GtkColorSelection colorsel))) ;; Range @@ -4578,24 +4574,24 @@ ()) (define-func gtk_status_icon_new_from_pixbuf - GtkStatusIcon + GtkStatusIcon ((GdkPixbuf pixbuf))) -(define-func gtk_status_icon_new_from_file +(define-func gtk_status_icon_new_from_file GtkStatusIcon ((string filename))) (define-func gtk_status_icon_new_from_stock - GtkStatusIcon + GtkStatusIcon ((string stock_id))) -(define-func gtk_status_icon_new_from_icon_name - GtkStatusIcon +(define-func gtk_status_icon_new_from_icon_name + GtkStatusIcon ((string icon_name))) -(define-func gtk_status_icon_set_from_pixbuf - none +(define-func gtk_status_icon_set_from_pixbuf + none ((GtkStatusIcon status_icon) (GdkPixbuf pixbuf))) @@ -4604,8 +4600,8 @@ ((GtkStatusIcon status_icon) (string filename))) -(define-func gtk_status_icon_set_from_stock - none +(define-func gtk_status_icon_set_from_stock + none ((GtkStatusIcon status_icon) (string stock_id))) @@ -4619,11 +4615,11 @@ ((GtkStatusIcon status_icon))) (define-func gtk_status_icon_get_pixbuf - GdkPixbuf + GdkPixbuf ((GtkStatusIcon status_icon))) (define-func gtk_status_icon_get_stock - GdkPixbuf + GdkPixbuf ((GtkStatusIcon status_icon))) (define-func gtk_status_icon_get_icon_name @@ -4639,7 +4635,7 @@ ; ((GtkStatusIcon status_icon) ; (GdkScreen screen))) -;(define-func gtk_status_icon_get_screen +;(define-func gtk_status_icon_get_screen ; GdkScreen ; ((GtkStatusIcon status_icon))) @@ -4685,6 +4681,51 @@ ((ret int) y) ((ret GtkOrientation) orientation))) +;; GtkColorButton + +(define-object GtkColorButton (GtkButton)) + +(define-func gtk_color_button_new + GtkWidget + ()) + +(define-func gtk_color_button_new_with_color + GtkWidget + ((GdkColor color))) + +(define-func gtk_color_button_set_color + none + ((GtkColorButton color_button) + (GdkColor color))) + +(define-func gtk_color_button_get_color + none + ((GtkColorButton color_button) + (GdkColor color))) + +(define-func gtk_color_button_set_alpha + none + ((GtkColorButton color_button) + (uint alpha))) + +(define-func gtk_color_button_get_alpha + none + ((GtkColorButton color_button))) + +(define-func gtk_color_button_set_use_alpha + none + ((GtkColorButton color_button) + (bool use_alpha))) + +(define-func gtk_color_button_get_use_alpha + bool + ((GtkColorButton color_button))) + +(define-func gtk_color_button_set_title + none + ((GtkColorButton color_button) + (string title))) + ;; More defs files (include "gtktext.defs") _______________________________________________ SVN-commits-list mailing list (read only) http://mail.gnome.org/mailman/listinfo/svn-commits-list Want to limit the commits to a few modules? Go to above URL, log in to edit your options and select the modules ('topics') you want. Next Message by Date: click to view message preview[dia] Account for deletion of app/dia_embedd.ccommit 2d932c4764cc1402075d62f86d19a18e30cbd8e7 Author: Hans Breuer <hans@xxxxxxxxxx> Date: Fri Jun 19 22:47:03 2009 +0200 Account for deletion of app/dia_embedd.c po/POTFILES.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) --- diff --git a/po/POTFILES.in b/po/POTFILES.in index 3c813e4..2d25bc0 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -8,7 +8,6 @@ app/confirm.c app/create_object.c app/defaults.c app/dia-props.c -app/dia_embedd.c app/diacanvas.c app/diagram.c app/diagram_tree.c _______________________________________________ SVN-commits-list mailing list (read only) http://mail.gnome.org/mailman/listinfo/svn-commits-list Want to limit the commits to a few modules? Go to above URL, log in to edit your options and select the modules ('topics') you want. Previous Message by Thread: click to view message preview[rep-gtk] began adding gtk+ 2.12 api -- see ChangeLog for (much) more infoscommit a0a0272f9b18daa6f9086db810667a4724943524 Author: chrisb <zanghar@xxxxxxxxxx> Date: Sat Jun 20 00:26:40 2009 +0200 began adding gtk+ 2.12 api -- see ChangeLog for (much) more infos ChangeLog | 88 ++++++++++++++-- config.guess | 28 ++++- config.sub | 37 +++++-- gcb.patch | 46 ++++++++ gtk.defs | 339 ++++++++++++++++++++++++++++++++------------------------- 5 files changed, 365 insertions(+), 173 deletions(-) --- diff --git a/ChangeLog b/ChangeLog index a63babf..13cab3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,76 @@ * configure.in: 0.18.6 released, bump to 0.90.0, bump minimal required gtk+ version to 2.12 (as I'll update the rep-gtk API to that version) + * gtk.defs: gtk+ 2.12 API added: + *********** gtkenums.h *********** + GtkArrowType >> none (GTK_ARROW_NONE) + GtkButtonBoxStyle >> center (GTK_BUTTONBOX_CENTER) + GtkSensitivityType >> auto (GTK_SENSITIVITY_AUTO) + GtkSensitivityType >> on (GTK_SENSITIVITY_ON) + GtkSensitivityType >> off (GTK_SENSITIVITY_OFF) + GtkMovementStep >> horizontal-pages (GTK_MOVEMENT_HORIZONTAL_PAGES) + GtkScrollStep >> steps (GTK_SCROLL_STEPS) + GtkScrollStep >> pages (GTK_SCROLL_PAGES) + GtkScrollStep >> ends (GTK_SCROLL_ENDS) + GtkScrollStep >> horizontal-steps (GTK_SCROLL_HORIZONTAL_STEPS) + GtkScrollStep >> horizontal-pages (GTK_SCROLL_HORIZONTAL_PAGES) + GtkScrollStep >> horizontal-ends (GTK_SCROLL_HORIZONTAL_ENDS) + GtkScrollType >> page-left (GTK_SCROLL_PAGE_LEFT) + GtkScrollType >> page-right (GTK_SCROLL_PAGE_RIGHT) + GtkWarpMode >> word-char (GTK_WRAP_WORD_CHAR) + GtkIMPreeditStyle >> nothing (GTK_IM_PREEDIT_NOTHING) + GtkIMPreeditStyle >> callback (GTK_IM_PREEDIT_CALLBACK) + GtkIMPreeditStyle >> none (GTK_IM_PREEDIT_NONE) + GtkIMStatusStyle >> nothing (GTK_IM_STATUS_NOTHING) + GtkIMStatusStyle >> callback (GTK_IM_STATUS_CALLBACK) + GtkIMStatusStyle >> none (GTK_IM_STATUS_NONE) + GtkPackDirection >> rtl (GTK_PACK_DIRECTION_RTL) + GtkPackDirection >> ltr (GTK_PACK_DIRECTION_LTR) + GtkPackDirection >> ttb (GTK_PACK_DIRECTION_TTB) + GtkPackDirection >> btt (GTK_PACK_DIRECTION_BTT) + GtkPrintPages >> all (GTK_PRINT_PAGES_ALL) + GtkPrintPages >> current (GTK_PRINT_PAGES_CURRENT) + GtkPrintPages >> ranges (GTK_PRINT_PAGES_RANGES) + GtkPageSet >> all (GTK_PAGE_SET_ALL) + GtkPageSet >> even (GTK_PAGE_SET_EVEN) + GtkPageSet >> odd (GTK_PAGE_SET_ODD) + GtkPageOrientation >> portrait (GTK_PAGE_ORIENTATION_PORTRAIT) + GtkPageOrientation >> landscape (GTK_PAGE_ORIENTATION_LANDSCAPE) + GtkPageOrientation >> reverse-portrait (GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT) + GtkPageOrientation >> reverse-landscape (GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE) + GtkPrintQuality >> low (GTK_PRINT_QUALITY_LOW) + GtkPrintQuality >> normal (GTK_PRINT_QUALITY_NORMAL) + GtkPrintQuality >> high (GTK_PRINT_QUALITY_HIGH) + GtkPrintQuality >> draft (GTK_PRINT_QUALITY_DRAFT) + GtkUnit >> pixl (GTK_UNIT_PIXEL) + GtkUnit >> points (GTK_UNIT_POINTS) + GtkUnit >> inch (GTK_UNIT_INCH) + GtkUnit >> mm (GTK_UNIT_MM) + GtkTreeViewGridLines >> none (GTK_TREE_VIEW_GRID_LINES_NONE) + GtkTreeViewGridLines >> horizontal (GTK_TREE_VIEW_GRID_LINES_HORIZONTAL) + GtkTreeViewGridLines >> vertical (GTK_TREE_VIEW_GRID_LINES_VERTICAL) + GtkTreeViewGridLines >> both (GTK_TREE_VIEW_GRID_LINES_BOTH) + GtkDragResult >> success (GTK_DRAG_RESULT_SUCCESS) + GtkDragResult >> no-target (GTK_DRAG_RESULT_NO_TARGET) + GtkDragResult >> user-cancelled (GTK_DRAG_RESULT_USER_CANCELLED) + GtkDragResult >> timeout-expired (GTK_DRAG_RESULT_TIMEOUT_EXPIRED) + GtkDragResult >> grab-broken (GTK_DRAG_RESULT_GRAB_BROKEN) + GtkDragResult >> error (GTK_DRAG_RESULT_ERROR) + *********** gtkcolorbutton.h *********** + Implemented new widget: GtkColorButton + + * gtk.defs: deprecated API removed: + GtkSignalRunType >> completely + GtkSubMenuDirection >> completely + GtkSubMenuPlacement >> completely + + * gtk.defs: deprecated API replaced: + GtkPreview* >> GtkColorButton + (apply the included gcb.patch to make sawfish-ui work with this change!) + + * gcb.patch: patch for sawfish, to make sawfish-ui work with the new GtkColorButton + instead of GtkPreview (which has been removed from rep-gtk now) + 2009-05-06 Christopher Bratusek <zanghar@xxxxxxxxxx> * rep-gtk.spec.in: - require gtk2 instead of gtk+ - add --libdir=%{_libdir} to configure flags @@ -32,17 +102,17 @@ 2009-03-04 Christopher Bratusek <zanghar@xxxxxxxxxx> * configure.in: 0.18.4 released, bump to 0.18.5 bump minimum gtk+ to 2.15.5 - + * gtk.defs: - - [ - ~ = not completely implemented - * = completely implemented - ^ not completely removed - # to implement low priority - ! to remove high priority + + [ + ~ = not completely implemented + * = completely implemented + ^ not completely removed + # to implement low priority + ! to remove high priority ] - + > implemented new stuff: - GtkArrowPlacement ~ - GtkArrowType -> none (= GTK_ARROW_NONE) * diff --git a/config.guess b/config.guess index f32079a..7b24a87 100755 --- a/config.guess +++ b/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2008-01-23' +timestamp='2008-11-15' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -331,7 +331,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if echo '\n#ifdef __amd64\nIS_64BIT_ARCH\n#endif' | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -796,7 +809,7 @@ EOF x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd) + EM64T | authenticamd | genuineintel) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -935,6 +948,9 @@ EOF if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -985,9 +1001,6 @@ EOF a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. @@ -1216,6 +1229,9 @@ EOF BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; diff --git a/config.sub b/config.sub index 6759825..053e738 100755 --- a/config.sub +++ b/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2008-01-16' +timestamp='2008-09-08' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -250,12 +250,14 @@ case $basic_machine in | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep \ + | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ @@ -286,7 +288,7 @@ case $basic_machine in | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) + | z8k | z80) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -331,12 +333,14 @@ case $basic_machine in | ip2k-* | iq2000-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ @@ -364,14 +368,14 @@ case $basic_machine in | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) ;; # Recognize the basic CPU types without company name, with glob match. xtensa*) @@ -459,6 +463,10 @@ case $basic_machine in basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -526,6 +534,10 @@ case $basic_machine in basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp @@ -1128,6 +1140,10 @@ case $basic_machine in basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -1248,7 +1264,7 @@ case $os in | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ + | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1388,6 +1404,9 @@ case $os in -zvmoe) os=-zvmoe ;; + -dicos*) + os=-dicos + ;; -none) ;; *) diff --git a/gcb.patch b/gcb.patch new file mode 100644 index 0000000..1d842f9 --- /dev/null +++ b/gcb.patch @@ -0,0 +1,46 @@ +diff --git a/lisp/sawfish/gtk/color-preview.jl b/lisp/sawfish/gtk/color-preview.jl +index f83120e..20eb9bc 100644 +--- a/lisp/sawfish/gtk/color-preview.jl ++++ b/lisp/sawfish/gtk/color-preview.jl +@@ -32,7 +32,7 @@ + (defconst color-preview-width 28) + (defconst color-preview-height 16) + +- (define (set-preview-color preview color) ++ (define (set-preview-color color-button color) + (let ((buf (make-string (* color-preview-width 3)))) + (let ((red (quotient (gdk-color-red color) 256)) + (green (quotient (gdk-color-green color) 256)) +@@ -43,24 +43,24 @@ + (aset buf (1+ (* i 3)) green) + (aset buf (+ 2 (* i 3)) blue))) + (do ((i 0 (1+ i))) +- ((= i color-preview-height)) +- (gtk-preview-draw-row preview buf 0 i color-preview-width)))) ++ ((= i color-preview-height))))) ++ ++;; XXX Fixme: Use a Vbox as container instead of another Button + + (define (button-new-with-color color-name) + (let ((button (gtk-button-new)) +- (preview (gtk-preview-new 'color)) ++ (color-button (gtk-color-button-new 'color)) + (color (and color-name (gdk-color-parse-interp color-name)))) +- (gtk-preview-size preview color-preview-width color-preview-height) + (when color +- (set-preview-color preview color)) +- (gtk-container-add button preview) ++ (gtk-color-button-set-color color-button color)) ++ (gtk-container-add button color-button) + button)) + + (define (set-button-color button color-name) + (let ((color (and color-name (gdk-color-parse-interp color-name)))) + (when color + (mapc (lambda (w) +- (when (gtk-preview-p w) +- (set-preview-color w color) ++ (when (gtk-color-button-p w) ++ (gtk-color-button-set-color w color) + (gtk-widget-draw-interp w))) + (gtk-container-get-children button)))))) diff --git a/gtk.defs b/gtk.defs index f79a09d..622d336 100644 --- a/gtk.defs +++ b/gtk.defs @@ -41,7 +41,8 @@ (up GTK_ARROW_UP) (down GTK_ARROW_DOWN) (left GTK_ARROW_LEFT) - (right GTK_ARROW_RIGHT)) + (right GTK_ARROW_RIGHT) + (none GTK_ARROW_NONE)) (define-flags GtkAttachOptions (expand GTK_EXPAND) @@ -53,7 +54,8 @@ (spread GTK_BUTTONBOX_SPREAD) (edge GTK_BUTTONBOX_EDGE) (start GTK_BUTTONBOX_START) - (end GTK_BUTTONBOX_END)) + (end GTK_BUTTONBOX_END) + (center GTK_BUTTONBOX_CENTER)) (define-enum GtkCurveType (linear GTK_CURVE_TYPE_LINEAR) @@ -98,6 +100,11 @@ (ltr GTK_TEXT_DIR_LTR) (rtl GTK_TEXT_DIR_RTL)) +(define-enum GtkSensitivityType + (auto GTK_SENSITIVITY_AUTO) + (on GTK_SENSITIVITY_ON) + (off GTK_SENSITIVITY_OFF)) + (define-enum GtkJustification (left GTK_JUSTIFY_LEFT) (right GTK_JUSTIFY_RIGHT) @@ -124,7 +131,16 @@ (paragraph-ends GTK_MOVEMENT_PARAGRAPH_ENDS) (paragraphs GTK_MOVEMENT_PARAGRAPHS) (pages GTK_MOVEMENT_PAGES) - (buffer-ends GTK_MOVEMENT_BUFFER_ENDS)) + (buffer-ends GTK_MOVEMENT_BUFFER_ENDS) + (horizontal-pages GTK_MOVEMENT_HORIZONTAL_PAGES)) + +(define-enum GtkScrollStep + (steps GTK_SCROLL_STEPS) + (pages GTK_SCROLL_PAGES) + (ends GTK_SCROLL_ENDS) + (horizontal-steps GTK_SCROLL_HORIZONTAL_STEPS) + (horizontal-pages GTK_SCROLL_HORIZONTAL_PAGES) + (horizontal-ends GTK_SCROLL_HORIZONTAL_ENDS)) (define-enum GtkOrientation (horizontal GTK_ORIENTATION_HORIZONTAL) @@ -164,11 +180,6 @@ (top GTK_POS_TOP) (bottom GTK_POS_BOTTOM)) -;; XXX deprecated -(define-enum GtkPreviewType - (color GTK_PREVIEW_COLOR) - (grayscale GTK_PREVIEW_GRAYSCALE)) - (define-enum GtkReliefStyle (normal GTK_RELIEF_NORMAL) (half GTK_RELIEF_HALF) @@ -179,15 +190,6 @@ (queue GTK_RESIZE_QUEUE) (immediate GTK_RESIZE_IMMEDIATE)) -;; XXX deprecated -(define-flags GtkSignalRunType - (first GTK_RUN_FIRST) - (last GTK_RUN_LAST) - (both GTK_RUN_BOTH) - (no-recurse GTK_RUN_NO_RECURSE) - (action GTK_RUN_ACTION) - (no-hooks GTK_RUN_NO_HOOKS)) - (define-enum GtkScrollType (none GTK_SCROLL_NONE) (jump GTK_SCROLL_JUMP) @@ -201,6 +203,8 @@ (page-down GTK_SCROLL_PAGE_DOWN) (step-left GTK_SCROLL_STEP_LEFT) (step-right GTK_SCROLL_STEP_RIGHT) + (page-left GTK_SCROLL_PAGE_LEFT) + (page-right GTK_SCROLL_PAGE_RIGHT) (start GTK_SCROLL_START) (end GTK_SCROLL_END)) @@ -224,14 +228,6 @@ (selected GTK_STATE_SELECTED) (insensitive GTK_STATE_INSENSITIVE)) -;; XXX deprecated -(define-enum GtkSubmenuDirection - (left GTK_DIRECTION_LEFT) - (right GTK_DIRECTION_RIGHT)) -(define-enum GtkSubmenuPlacement - (top-bottom GTK_TOP_BOTTOM) - (left-right GTK_LEFT_RIGHT)) - (define-enum GtkToolbarStyle (icons GTK_TOOLBAR_ICONS) (text GTK_TOOLBAR_TEXT) @@ -262,12 +258,71 @@ (define-enum GtkWrapMode (none GTK_WRAP_NONE) (char GTK_WRAP_CHAR) - (word GTK_WRAP_WORD)) + (word GTK_WRAP_WORD) + (word-char GTK_WRAP_WORD_CHAR)) (define-enum GtkSortType (ascending GTK_SORT_ASCENDING) (descending GTK_SORT_DESCENDING)) +(define-enum GtkIMPreeditStyle + (nothing GTK_IM_PREEDIT_NOTHING) + (callback GTK_IM_PREEDIT_CALLBACK) + (none GTK_IM_PREEDIT_NONE)) + +(define-enum GtkIMStatusStyle + (nothing GTK_IM_STATUS_NOTHING) + (callback GTK_IM_STATUS_CALLBACK) + (none GTK_IM_STATUS_NONE)) + +(define-enum GtkPackDirection + (rtl GTK_PACK_DIRECTION_RTL) + (ltr GTK_PACK_DIRECTION_LTR) + (ttb GTK_PACK_DIRECTION_TTB) + (btt GTK_PACK_DIRECTION_BTT)) + +(define-enum GtkPrintPages + (all GTK_PRINT_PAGES_ALL) + (current GTK_PRINT_PAGES_CURRENT) + (ranges GTK_PRINT_PAGES_RANGES)) + +(define-enum GtkPageSet + (all GTK_PAGE_SET_ALL) + (even GTK_PAGE_SET_EVEN) + (odd GTK_PAGE_SET_ODD)) + +(define-enum GtkPageOrientation + (portrait GTK_PAGE_ORIENTATION_PORTRAIT) + (landscape GTK_PAGE_ORIENTATION_LANDSCAPE) + (reverse-portrait GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT) + (reverse-landscape GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE)) + +(define-enum GtkPrintQuality + (low GTK_PRINT_QUALITY_LOW) + (normal GTK_PRINT_QUALITY_NORMAL) + (high GTK_PRINT_QUALITY_HIGH) + (draft GTK_PRINT_QUALITY_DRAFT)) + +(define-enum GtkUnit + (pixel GTK_UNIT_PIXEL) + (points GTK_UNIT_POINTS) + (inch GTK_UNIT_INCH) + (mm GTK_UNIT_MM)) + +(define-enum GtkTreeViewGridLines + (none GTK_TREE_VIEW_GRID_LINES_NONE) + (horizontal GTK_TREE_VIEW_GRID_LINES_HORIZONTAL) + (vertical GTK_TREE_VIEW_GRID_LINES_VERTICAL) + (both GTK_TREE_VIEW_GRID_LINES_BOTH)) + +(define-enum GtkDragResult + (success GTK_DRAG_RESULT_SUCCESS) + (no-target GTK_DRAG_RESULT_NO_TARGET) + (user-cancelled GTK_DRAG_RESULT_USER_CANCELLED) + (timeout-expired GTK_DRAG_RESULT_TIMEOUT_EXPIRED) + (grab-broken GTK_DRAG_RESULT_GRAB_BROKEN) + (error GTK_DRAG_RESULT_ERROR)) + ;(define-enum GtkMenuFactoryType ; (menu GTK_MENU_FACTORY_MENU) ; (menu-bar GTK_MENU_FACTORY_MENU_BAR) @@ -377,7 +432,7 @@ (no-month-changed GTK_CALENDAR_NO_MONTH_CHANGE) (show-week-numbers GTK_CALENDAR_SHOW_WEEK_NUMBERS) (week-start-monday GTK_CALENDAR_WEEK_START_MONDAY)) - + ;;; Gtk boxed types (define-object GtkWidget (GtkObject) @@ -407,7 +462,7 @@ ;;; Functions -;; +;; ;; gtkmain.h @@ -953,7 +1008,7 @@ ((GtkContainer container))) ;; XXX this is deprecated? -(define-func gtk_container_foreach_full +(define-func gtk_container_foreach_full none ((GtkContainer container) (full-callback function (protect-during))) @@ -980,7 +1035,7 @@ GtkWidget ()) -(define-func gtk_fixed_put +(define-func gtk_fixed_put none ((GtkFixed fixed) (GtkWidget widget) @@ -1044,7 +1099,7 @@ (define-object GtkTree (GtkContainer)) -(define-func gtk_tree_new +(define-func gtk_tree_new GtkWidget ()) @@ -1125,7 +1180,7 @@ (int rows) (int columns))) -(define-func gtk_clist_new +(define-func gtk_clist_new GtkWidget ((int columns))) @@ -1166,7 +1221,7 @@ ((GtkCList clist) (bool reorderable))) -(define-func gtk_clist_set_use_drag_icons +(define-func gtk_clist_set_use_drag_icons none ((GtkCList list) (bool use_icons))) @@ -1361,7 +1416,7 @@ ((GtkCList clist) (int row))) -(define-func gtk_clist_set_shift +(define-func gtk_clist_set_shift none ((GtkCList clist) (int row) @@ -1391,15 +1446,15 @@ ((GtkCList clist) ;; uhhh, this is hacky ((fvec string "((GtkCList*)sgtk_get_gtkobj (p_clist))->columns") text))) - + (define-func gtk_clist_insert int ((GtkCList clist) (int row) ;; uhhh, this is hacky ((fvec string "((GtkCList*)sgtk_get_gtkobj (p_clist))->columns") text))) - -(define-func gtk_clist_remove + +(define-func gtk_clist_remove none ((GtkCList clist) (int row))) @@ -1474,7 +1529,7 @@ (define-object GtkEventBox (GtkBin)) -(define-func gtk_event_box_new +(define-func gtk_event_box_new GtkWidget ()) @@ -1822,12 +1877,12 @@ (define-object GtkButtonBox (GtkBox)) -(define-func gtk_button_box_set_layout - none +(define-func gtk_button_box_set_layout + none ((GtkButtonBox widget) (GtkButtonBoxStyle layout_style))) -(define-func gtk_button_box_get_layout +(define-func gtk_button_box_get_layout GtkButtonBoxStyle ((GtkButtonBox widget))) @@ -1837,7 +1892,7 @@ (GtkWidget child) (bool is_secondary))) -(define-func gtk_button_box_set_child_size +(define-func gtk_button_box_set_child_size none ((GtkButtonBox widget) (int min_width) @@ -1855,7 +1910,7 @@ (define-object GtkHButtonBox (GtkButtonBox)) -(define-func gtk_hbutton_box_new +(define-func gtk_hbutton_box_new GtkWidget ()) @@ -1863,7 +1918,7 @@ (define-object GtkVButtonBox (GtkButtonBox)) -(define-func gtk_vbutton_box_new +(define-func gtk_vbutton_box_new GtkWidget ()) @@ -1880,7 +1935,7 @@ ;; (define-func gtk_toolbar_prepend_item) ;; (define-func gtk_toolbar_insert_item) ;; (define-func gtk_toolbar_insert_stock) - + (define-func gtk_toolbar_append_space none ((GtkToolbar toolbar))) @@ -2248,7 +2303,7 @@ (define-object GtkArrow (GtkWidget)) -(define-func gtk_arrow_new +(define-func gtk_arrow_new GtkWidget ((GtkArrowType arrow_type) (GtkShadowType shadow_type))) @@ -2407,11 +2462,11 @@ ;; XXX get_size (define-func gtk_layout_get_hadjustment - GtkAdjustment + GtkAdjustment ((GtkLayout layout))) (define-func gtk_layout_get_vadjustment - GtkAdjustment + GtkAdjustment ((GtkLayout layout))) (define-func gtk_layout_set_hadjustment @@ -2473,22 +2528,22 @@ (define-object GtkItem (GtkBin)) -(define-func gtk_item_select +(define-func gtk_item_select none ((GtkItem item))) -(define-func gtk_item_deselect +(define-func gtk_item_deselect none ((GtkItem item))) -(define-func gtk_item_toggle +(define-func gtk_item_toggle none ((GtkItem item))) ;;;; GtkCombo (define-object GtkCombo (GtkHBox) - (fields + (fields (GtkWidget entry) (GtkWidget button) (GtkWidget popup) @@ -2496,7 +2551,7 @@ (GtkWidget list))) (define-func gtk_combo_new - GtkWidget + GtkWidget ()) (define-func gtk_combo_set_value_in_list @@ -3291,7 +3346,7 @@ (GtkWidget child) (GtkWidget tab_label))) -(define-func gtk_notebook_append_page_menu +(define-func gtk_notebook_append_page_menu none ((GtkNotebook notebook) (GtkWidget child) @@ -3304,7 +3359,7 @@ (GtkWidget child) (GtkWidget tab_label))) -(define-func gtk_notebook_prepend_page_menu +(define-func gtk_notebook_prepend_page_menu none ((GtkNotebook notebook) (GtkWidget child) @@ -3318,7 +3373,7 @@ (GtkWidget tab_label) (int position))) -(define-func gtk_notebook_insert_page_menu +(define-func gtk_notebook_insert_page_menu none ((GtkNotebook notebook) (GtkWidget child) @@ -3385,20 +3440,20 @@ GtkPositionType ((GtkNotebook notebook))) -(define-func gtk_notebook_set_scrollable +(define-func gtk_notebook_set_scrollable none ((GtkNotebook notebook) (bool scrollable))) -(define-func gtk_notebook_get_scrollable +(define-func gtk_notebook_get_scrollable bool ((GtkNotebook notebook))) -(define-func gtk_notebook_popup_enable +(define-func gtk_notebook_popup_enable none ((GtkNotebook notebook))) - -(define-func gtk_notebook_popup_disable + +(define-func gtk_notebook_popup_disable none ((GtkNotebook notebook))) @@ -3600,28 +3655,28 @@ ((GtkAdjustment adjustment) (double climb_rate) (int digits))) - + (define-func gtk_spin_button_new_with_range GtkWidget ((double min) (double max) (double step))) -(define-func gtk_spin_button_set_adjustment +(define-func gtk_spin_button_set_adjustment none ((GtkSpinButton spin_button) (GtkAdjustment adjustment))) -(define-func gtk_spin_button_get_adjustment +(define-func gtk_spin_button_get_adjustment GtkAdjustment ((GtkSpinButton spin_button))) -(define-func gtk_spin_button_set_digits +(define-func gtk_spin_button_set_digits none ((GtkSpinButton spin_button) (int digits))) -(define-func gtk_spin_button_get_digits +(define-func gtk_spin_button_get_digits int ((GtkSpinButton spin_button))) @@ -3645,21 +3700,21 @@ double ((GtkSpinButton spin_button))) -(define-func gtk_spin_button_get_value_as_int +(define-func gtk_spin_button_get_value_as_int int ((GtkSpinButton spin_button))) -(define-func gtk_spin_button_set_value +(define-func gtk_spin_button_set_value none - ((GtkSpinButton spin_button) + ((GtkSpinButton spin_button) (double value))) -(define-func gtk_spin_button_set_update_policy +(define-func gtk_spin_button_set_update_policy none ((GtkSpinButton spin_button) (GtkSpinButtonUpdatePolicy policy))) -(define-func gtk_spin_button_get_update_policy +(define-func gtk_spin_button_get_update_policy GtkSpinButtonUpdatePolicy ((GtkSpinButton spin_button))) @@ -3719,7 +3774,7 @@ (float xscale) (float yscale))) -;; DrawingArea +;; DrawingArea (define-object GtkDrawingArea (GtkWidget)) @@ -3763,65 +3818,6 @@ ((GtkCurve curve) (GtkCurveType type))) - -;; Preview - -(define-object GtkPreview (GtkWidget)) - -(define-func gtk_preview_new - GtkWidget - ((GtkPreviewType type))) - -(define-func gtk_preview_size - none - ((GtkPreview preview) - (int width) - (int height))) - -(define-func gtk_preview_put - none - ((GtkPreview preview) - (GdkWindow window) - (GdkGC gc) - (int srcx) - (int srcy) - (int destx) - (int desty) - (int width) - (int height))) - -(define-func gtk_preview_draw_row - none - ((GtkPreview preview) - (string data) - (int x) - (int y) - (int w))) - -(define-func gtk_preview_set_expand - none - ((GtkPreview preview) - (bool expand))) - -(define-func gtk_preview_set_gamma - none - ((double gamma))) - -(define-func gtk_preview_set_color_cube - none - ((uint nred_shades) - (uint ngreen_shades) - (uint nblue_shades) - (uint ngray_shades))) - -(define-func gtk_preview_set_install_cmap - none - ((bool install_cmap))) - -(define-func gtk_preview_set_reserved - none - ((int nreserved))) - ;; FileSelection (define-object GtkFileSelection (GtkWindow) @@ -3865,14 +3861,14 @@ ;; FontSelectionDialog (define-object GtkFontSelectionDialog (GtkWindow) - (fields + (fields (GtkWidget main_vbox) (GtkWidget action_area) (GtkWidget ok_button) (GtkWidget apply_button) (GtkWidget cancel_button))) - -(define-func gtk_font_selection_dialog_new + +(define-func gtk_font_selection_dialog_new GtkWidget ((string title))) @@ -3888,12 +3884,12 @@ (define-func gtk_font_selection_dialog_get_preview_text static_string ((GtkFontSelectionDialog fontsel))) - + (define-func gtk_font_selection_dialog_set_preview_text none ((GtkFontSelectionDialog fontsel) (string text))) - + ;; ColorSelectionDialog (define-object GtkColorSelectionDialog (GtkWindow) @@ -3965,7 +3961,7 @@ ;; This returns a color which is not allocated in any colormap. (define-func gtk_color_selection_get_color_interp GdkColor - ((GtkColorSelection colorsel))) + ((GtkColorSelection colorsel))) ;; Range @@ -4578,24 +4574,24 @@ ()) (define-func gtk_status_icon_new_from_pixbuf - GtkStatusIcon + GtkStatusIcon ((GdkPixbuf pixbuf))) -(define-func gtk_status_icon_new_from_file +(define-func gtk_status_icon_new_from_file GtkStatusIcon ((string filename))) (define-func gtk_status_icon_new_from_stock - GtkStatusIcon + GtkStatusIcon ((string stock_id))) -(define-func gtk_status_icon_new_from_icon_name - GtkStatusIcon +(define-func gtk_status_icon_new_from_icon_name + GtkStatusIcon ((string icon_name))) -(define-func gtk_status_icon_set_from_pixbuf - none +(define-func gtk_status_icon_set_from_pixbuf + none ((GtkStatusIcon status_icon) (GdkPixbuf pixbuf))) @@ -4604,8 +4600,8 @@ ((GtkStatusIcon status_icon) (string filename))) -(define-func gtk_status_icon_set_from_stock - none +(define-func gtk_status_icon_set_from_stock + none ((GtkStatusIcon status_icon) (string stock_id))) @@ -4619,11 +4615,11 @@ ((GtkStatusIcon status_icon))) (define-func gtk_status_icon_get_pixbuf - GdkPixbuf + GdkPixbuf ((GtkStatusIcon status_icon))) (define-func gtk_status_icon_get_stock - GdkPixbuf + GdkPixbuf ((GtkStatusIcon status_icon))) (define-func gtk_status_icon_get_icon_name @@ -4639,7 +4635,7 @@ ; ((GtkStatusIcon status_icon) ; (GdkScreen screen))) -;(define-func gtk_status_icon_get_screen +;(define-func gtk_status_icon_get_screen ; GdkScreen ; ((GtkStatusIcon status_icon))) @@ -4685,6 +4681,51 @@ ((ret int) y) ((ret GtkOrientation) orientation))) +;; GtkColorButton + +(define-object GtkColorButton (GtkButton)) + +(define-func gtk_color_button_new + GtkWidget + ()) + +(define-func gtk_color_button_new_with_color + GtkWidget + ((GdkColor color))) + +(define-func gtk_color_button_set_color + none + ((GtkColorButton color_button) + (GdkColor color))) + +(define-func gtk_color_button_get_color + none + ((GtkColorButton color_button) + (GdkColor color))) + +(define-func gtk_color_button_set_alpha + none + ((GtkColorButton color_button) + (uint alpha))) + +(define-func gtk_color_button_get_alpha + none + ((GtkColorButton color_button))) + +(define-func gtk_color_button_set_use_alpha + none + ((GtkColorButton color_button) + (bool use_alpha))) + +(define-func gtk_color_button_get_use_alpha + bool + ((GtkColorButton color_button))) + +(define-func gtk_color_button_set_title + none + ((GtkColorButton color_button) + (string title))) + ;; More defs files (include "gtktext.defs") _______________________________________________ SVN-commits-list mailing list (read only) http://mail.gnome.org/mailman/listinfo/svn-commits-list Want to limit the commits to a few modules? Go to above URL, log in to edit your options and select the modules ('topics') you want. Next Message by Thread: click to view message preview[dia] Account for deletion of app/dia_embedd.ccommit 2d932c4764cc1402075d62f86d19a18e30cbd8e7 Author: Hans Breuer <hans@xxxxxxxxxx> Date: Fri Jun 19 22:47:03 2009 +0200 Account for deletion of app/dia_embedd.c po/POTFILES.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) --- diff --git a/po/POTFILES.in b/po/POTFILES.in index 3c813e4..2d25bc0 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -8,7 +8,6 @@ app/confirm.c app/create_object.c app/defaults.c app/dia-props.c -app/dia_embedd.c app/diacanvas.c app/diagram.c app/diagram_tree.c _______________________________________________ SVN-commits-list mailing list (read only) http://mail.gnome.org/mailman/listinfo/svn-commits-list Want to limit the commits to a few modules? Go to above URL, log in to edit your options and select the modules ('topics') you want.
Web Hosting Reviews from OSDir.com Sister Site iBizWebHosting.com
|
|
