From b7935e5e78970188c8cd853f20d8bdf3dbaf3f2a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 28 Dec 2008 06:59:23 +0000 Subject: [PATCH] Additions 2008-12-27 Matthias Clasen * gtk/tmpl/gtkmessagedialog.sgml: * gtk/tmpl/gtkmenushell.sgml: * gtk/tmpl/gtklinkbutton.sgml: * gtk/tmpl/gtkimage.sgml: Additions * gtk/gtk-sections.txt: * gtk/gtk-docs.sgml: Add GtkHSV * gtk/Makefile.am: Don't ignore gtkhsv.h svn path=/trunk/; revision=21954 --- docs/reference/ChangeLog | 11 ++++++ docs/reference/gtk/Makefile.am | 1 - docs/reference/gtk/gtk-docs.sgml | 3 +- docs/reference/gtk/gtk-sections.txt | 23 +++++++++++++ docs/reference/gtk/tmpl/gtkimage.sgml | 3 +- docs/reference/gtk/tmpl/gtklinkbutton.sgml | 4 +-- docs/reference/gtk/tmpl/gtkmenushell.sgml | 34 +++---------------- docs/reference/gtk/tmpl/gtkmessagedialog.sgml | 2 +- 8 files changed, 44 insertions(+), 37 deletions(-) diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 5af44ce1f8..e93a6208b2 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,14 @@ +2008-12-27 Matthias Clasen + + * gtk/tmpl/gtkmessagedialog.sgml: + * gtk/tmpl/gtkmenushell.sgml: + * gtk/tmpl/gtklinkbutton.sgml: + * gtk/tmpl/gtkimage.sgml: Additions + + * gtk/gtk-sections.txt: + * gtk/gtk-docs.sgml: Add GtkHSV + * gtk/Makefile.am: Don't ignore gtkhsv.h + 2008-12-27 Matthias Clasen * gtk/gtk-sections.txt: Remove nonexisting api diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index 7950ccc231..dee991f5a5 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -41,7 +41,6 @@ IGNORE_HFILES= \ gtkfilesystemmodel.h \ gtkfilesystemunix.h \ gtkfilesystemwin32.h \ - gtkhsv.h \ gtkiconcache.h \ gtkiconcachevalidator.h \ gtkiconthemeparser.h \ diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml index 980de935c8..51afa822d3 100644 --- a/docs/reference/gtk/gtk-docs.sgml +++ b/docs/reference/gtk/gtk-docs.sgml @@ -252,8 +252,9 @@ that is, GUI components such as #GtkButton or #GtkTextView. Selectors (File/Font/Color/Input Devices) - + + diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index bb304688b5..fce6729931 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -793,6 +793,29 @@ gtk_color_button_get_type GtkColorButtonPrivate +
+gtkhsv +GtkHSV +GtkHSV +gtk_hsv_new +gtk_hsv_set_color +gtk_hsv_get_color +gtk_hsv_set_metrics +gtk_hsv_get_metrics +gtk_hsv_is_adjusting +gtk_hsv_to_rgb +gtk_rgb_to_hsv + +GTK_TYPE_HSV +GTK_HSV +GTK_HSV_CLASS +GTK_IS_HSV +GTK_IS_HSV_CLASS +GTK_HSV_GET_CLASS + +gtk_hsv_get_type +
+
gtkcolorsel GtkColorSelection diff --git a/docs/reference/gtk/tmpl/gtkimage.sgml b/docs/reference/gtk/tmpl/gtkimage.sgml index a9e074b689..b7e3fd8b7f 100644 --- a/docs/reference/gtk/tmpl/gtkimage.sgml +++ b/docs/reference/gtk/tmpl/gtkimage.sgml @@ -196,7 +196,8 @@ functions), but they will all return %NULL values. @GTK_IMAGE_ANIMATION: the widget contains a #GdkPixbufAnimation @GTK_IMAGE_ICON_NAME: the widget contains a named icon. This image type was added in GTK+ 2.6 -@GTK_IMAGE_GICON: +@GTK_IMAGE_GICON: the widgte contains a #GIcon. + This image type was added in GTK+ 2.14 diff --git a/docs/reference/gtk/tmpl/gtklinkbutton.sgml b/docs/reference/gtk/tmpl/gtklinkbutton.sgml index 615ffad37f..f7ed37881d 100644 --- a/docs/reference/gtk/tmpl/gtklinkbutton.sgml +++ b/docs/reference/gtk/tmpl/gtklinkbutton.sgml @@ -100,11 +100,9 @@ clicked. @button: the #GtkLinkButton which was clicked -@link_: +@link_: the URI to which the clicked #GtkLinkButton points @user_data: user data that was passed when the function was registered with gtk_link_button_set_uri_hook() - -@link: the URI to which the clicked #GtkLinkButton points diff --git a/docs/reference/gtk/tmpl/gtkmenushell.sgml b/docs/reference/gtk/tmpl/gtkmenushell.sgml index fed90fd7dd..90dece5e27 100644 --- a/docs/reference/gtk/tmpl/gtkmenushell.sgml +++ b/docs/reference/gtk/tmpl/gtkmenushell.sgml @@ -212,36 +212,10 @@ after the menu item is activated. An enumeration representing directional movements within a menu. - - - - - - -GTK_MENU_DIR_PARENT -To the parent menu shell. - - - -GTK_MENU_DIR_CHILD -To the submenu, if any, associated with the item. - - - -GTK_MENU_DIR_NEXT -To the next menu item. - - - -GTK_MENU_DIR_PREV -To the previous menu item. - - - -@GTK_MENU_DIR_PARENT: -@GTK_MENU_DIR_CHILD: -@GTK_MENU_DIR_NEXT: -@GTK_MENU_DIR_PREV: +@GTK_MENU_DIR_PARENT: To the parent menu shell. +@GTK_MENU_DIR_CHILD: To the submenu, if any, associated with the item. +@GTK_MENU_DIR_NEXT: To the next menu item. +@GTK_MENU_DIR_PREV: To the previous menu item. diff --git a/docs/reference/gtk/tmpl/gtkmessagedialog.sgml b/docs/reference/gtk/tmpl/gtkmessagedialog.sgml index c3ecd23586..f2122cbd09 100644 --- a/docs/reference/gtk/tmpl/gtkmessagedialog.sgml +++ b/docs/reference/gtk/tmpl/gtkmessagedialog.sgml @@ -120,7 +120,7 @@ The type of message being displayed in the dialog. @GTK_MESSAGE_WARNING: Nonfatal warning message @GTK_MESSAGE_QUESTION: Question requiring a choice @GTK_MESSAGE_ERROR: Fatal error message -@GTK_MESSAGE_OTHER: +@GTK_MESSAGE_OTHER: None of the above, doesn't get an icon