rep-gtk r412 - trunk

[chrisb svn gnome org]

Author: chrisb
Date: Thu Mar  5 08:12:34 2009
New Revision: 412
URL: http://svn.gnome.org/viewvc/rep-gtk?rev=412&view=rev

Log:
0.18.4 released, bump to 0.18.5
bump gtk+ requirement to 2.15.5
begin adding new gtk+ stuff


Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/config.h.in
   trunk/configure.in
   trunk/gtk.defs

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Thu Mar  5 08:12:34 2009
@@ -1,3 +1,6 @@
+0.18.5:
+	- bump minimum gtk+ to 2.15.5
+
 0.18.4:
 	- small code cleanup
 	- reworked configure.in

Modified: trunk/config.h.in
==============================================================================
--- trunk/config.h.in	(original)
+++ trunk/config.h.in	Thu Mar  5 08:12:34 2009
@@ -1,8 +1,5 @@
 /* config.h.in.  Generated from configure.in by autoheader.  */
 
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
@@ -36,10 +33,6 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LT_OBJDIR
-
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Mar  5 08:12:34 2009
@@ -29,7 +29,7 @@
 AM_PROG_LIBTOOL
 
 dnl Release versioning info
-version="0.18.4"
+version="0.18.5"
 
 dnl Find the system type; this isn't crucial
 AC_CANONICAL_HOST
@@ -57,7 +57,7 @@
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_MIN_VER)
 
 dnl Check for GTK
-GTK_MIN_VER="2.6"
+GTK_MIN_VER="2.15.5"
 pc_libs=""
 
 PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_MIN_VER

Modified: trunk/gtk.defs
==============================================================================
--- trunk/gtk.defs	(original)
+++ trunk/gtk.defs	Thu Mar  5 08:12:34 2009
@@ -26,6 +26,11 @@
 (import "gdk.defs")
 (import "gdk-pixbuf.defs")
 
+;; XXX Marked for removal
+(define-enum GtkPreviewType
+  (color GTK_PREVIEW_COLOR)
+  (grayscale GTK_PREVIEW_GRAYSCALE))
+
 (define-enum GtkAnchorType
   (center GTK_ANCHOR_CENTER)
   (north GTK_ANCHOR_NORTH)
@@ -41,7 +46,13 @@
   (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-enum GtkArrowPlacement
+  (both GTK_ARROWS_BOTH)
+  (start GTK_ARROWS_START)
+  (end GTK_ARROWS_END))
 
 (define-flags GtkAttachOptions
   (expand GTK_EXPAND)
@@ -53,7 +64,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 +110,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 +141,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 +190,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 +200,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)
@@ -224,14 +236,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 +266,39 @@
 (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
+  (ltr GTK_PACK_DIRECTION_LTR)
+  (rtl GTK_PACK_DIRECTION_RTL)
+  (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 GtkMenuFactoryType
 ;  (menu GTK_MENU_FACTORY_MENU)
 ;  (menu-bar GTK_MENU_FACTORY_MENU_BAR)
@@ -3763,7 +3794,7 @@
   ((GtkCurve curve)
    (GtkCurveType type)))
 
-
+;; XXX Marked for removal
 ;; Preview
 
 (define-object GtkPreview (GtkWidget))