diff --git a/ChangeLog b/ChangeLog index a6844c497c..476c3c51da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-11-15 Sven Neumann + + * configure.in + * app/Makefile.am: moved the definition of the symbol prefix to + the configure script. Set it to '_' for MacOS X and Win32. + + * libgimpwidgets/gimpwidgets.[ch]: removed the deprecation guards + again. It doesn't make sense to deprecate these function now. + 2003-11-15 Michael Natterer * plug-ins/common/gee.c diff --git a/configure.in b/configure.in index c56710638d..3e8ca7ae76 100644 --- a/configure.in +++ b/configure.in @@ -578,6 +578,32 @@ if test "x$shmtype" = "xsysv"; then fi +######################## +# Define a symbol prefix +######################## + +AC_MSG_CHECKING([whether symbols are prefixed]) + +case "$target_or_host" in + *-*-mingw*) + SYMPREFIX='_' + ;; + darwin* | rhapsody* | machten*) + SYMPREFIX='_' + ;; + *) + ;; +esac + +if test -n "$SYMPREFIX"; then + AC_MSG_RESULT([yes, with a $SYMPREFIX]) +else + AC_MSG_RESULT(no) +fi + +AC_SUBST(SYMPREFIX) + + ################################## # Check for regex support in glibc ################################## diff --git a/devel-docs/ChangeLog b/devel-docs/ChangeLog index 15bfabd5f0..6fd8766827 100644 --- a/devel-docs/ChangeLog +++ b/devel-docs/ChangeLog @@ -1,3 +1,11 @@ +2003-11-15 Sven Neumann + + * app/Makefile.am (unused_symbols): use $SYMPREFIX as defined by + the configure script. + + * libgimpwidgets/libgimpwidgets-sections.txt + * libgimpwidgets/tmpl/gimpwidgets.sgml: added new functions. + 2003-11-14 Sven Neumann * libgimpwidgets/Makefile.am: tell gtk-doc about diff --git a/devel-docs/app/Makefile.am b/devel-docs/app/Makefile.am index f207f823b0..04396c021f 100644 --- a/devel-docs/app/Makefile.am +++ b/devel-docs/app/Makefile.am @@ -61,12 +61,12 @@ GTKDOC_CFLAGS = \ -I$(includedir) unused_symbols = \ - -u gimp_container_get_filtered_name_array \ - -u gimp_xml_parser_new \ - -u gimp_drawable_stroke_vectors + -u $(SYMPREFIX)gimp_container_filter \ + -u $(SYMPREFIX)gimp_xml_parser_new \ + -u $(SYMPREFIX)gimp_drawable_stroke_vectors GTKDOC_LIBS = \ - $(unused_symbols) \ + $(unused_symbols) \ $(top_builddir)/app/app_procs.o \ $(top_builddir)/app/batch.o \ $(top_builddir)/app/errors.o \ diff --git a/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt b/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt index 194545cd76..698daebb16 100644 --- a/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt +++ b/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt @@ -480,17 +480,20 @@ GIMP_STOCK_WILBER_EEK
gimpwidgets GimpWidgets -gimp_int_option_menu_new -gimp_int_option_menu_set_history gimp_option_menu_new gimp_option_menu_new2 gimp_option_menu_set_history gimp_option_menu_set_sensitive GimpOptionMenuSensitivityCallback -gimp_int_radio_group_new +gimp_int_option_menu_new +gimp_int_option_menu_set_history +gimp_int_option_menu_set_sensitive +GimpIntOptionMenuSensitivityCallback gimp_radio_group_new gimp_radio_group_new2 gimp_radio_group_set_active +gimp_int_radio_group_new +gimp_int_radio_group_set_active gimp_spin_button_new GIMP_SCALE_ENTRY_LABEL GIMP_SCALE_ENTRY_SCALE diff --git a/devel-docs/libgimpwidgets/tmpl/gimpwidgets.sgml b/devel-docs/libgimpwidgets/tmpl/gimpwidgets.sgml index 04343efd30..d73ddd59b2 100644 --- a/devel-docs/libgimpwidgets/tmpl/gimpwidgets.sgml +++ b/devel-docs/libgimpwidgets/tmpl/gimpwidgets.sgml @@ -15,28 +15,6 @@ helper functions. - - - - - -@menu_only: -@menu_item_callback: -@menu_item_callback_data: -@initial: -@Varargs: -@Returns: - - - - - - - -@option_menu: -@item_data: - - @@ -89,20 +67,48 @@ helper functions. @Returns: - + -@in_frame: -@frame_title: -@radio_button_callback: -@radio_button_callback_data: +@menu_only: +@menu_item_callback: +@menu_item_callback_data: @initial: @Varargs: @Returns: + + + + + +@option_menu: +@item_data: + + + + + + + +@option_menu: +@callback: +@callback_data: + + + + + + + +@item_data: +@callback_data: +@Returns: + + @@ -137,6 +143,29 @@ helper functions. @item_data: + + + + + +@in_frame: +@frame_title: +@radio_button_callback: +@radio_button_callback_data: +@initial: +@Varargs: +@Returns: + + + + + + + +@radio_button: +@item_data: + + diff --git a/libgimpwidgets/gimpwidgets.c b/libgimpwidgets/gimpwidgets.c index 62d1daa43a..981868b117 100644 --- a/libgimpwidgets/gimpwidgets.c +++ b/libgimpwidgets/gimpwidgets.c @@ -51,8 +51,6 @@ * @menu_only: %TRUE if the function should return a #GtkMenu only. * @...: A %NULL-terminated @va_list describing the menu items. * - * DEPRECATED. Use gimp_int_option_menu_new() instead. - * * Convenience function to create a #GtkOptionMenu or a #GtkMenu. * * Returns: A #GtkOptionMenu or a #GtkMenu (depending on @menu_only). @@ -167,8 +165,6 @@ gimp_option_menu_new (gboolean menu_only, * @initial: The @item_data of the initially selected menu item. * @...: A %NULL-terminated @va_list describing the menu items. * - * DEPRECATED. Use gimp_int_option_menu_new() instead. - * * Convenience function to create a #GtkOptionMenu or a #GtkMenu. * * Returns: A #GtkOptionMenu or a #GtkMenu (depending on @menu_only). @@ -388,8 +384,6 @@ gimp_int_option_menu_new (gboolean menu_only, * gimp_option_menu_new2(). * @item_data: The @item_data of the menu item you want to select. * - * DEPRECATED. Use gimp_int_option_menu_set_history() instead. - * * Iterates over all entries in a #GtkOptionMenu and selects the one * with the matching @item_data. Probably only makes sense to use with * a #GtkOptionMenu that was created using gimp_option_menu_new() or @@ -453,8 +447,6 @@ gimp_int_option_menu_set_history (GtkOptionMenu *option_menu, * the sensitivity state. * @callback_data: data to pass to the @callback function. * - * DEPRECATED. Use gimp_int_option_menu_set_sensitive() instead. - * * Calls the given @callback for each item in the menu and passes it the * item_data and the @callback_data. The menu item's sensitivity is set * according to the return value of this function. @@ -537,8 +529,6 @@ gimp_int_option_menu_set_sensitive (GtkOptionMenu *option * @frame_title: The title of the Frame or %NULL if you don't want a title. * @...: A %NULL-terminated @va_list describing the radio buttons. * - * DEPRECATED. Use gimp_int_radio_group_new() instead. - * * Convenience function to create a group of radio buttons embedded into * a #GtkFrame or #GtkVbox. * @@ -650,8 +640,6 @@ gimp_radio_group_new (gboolean in_frame, * @...: A %NULL-terminated @va_list describing * the radio buttons. * - * DEPRECATED. Use gimp_int_radio_group_new() instead. - * * Convenience function to create a group of radio buttons embedded into * a #GtkFrame or #GtkVbox. * @@ -861,10 +849,8 @@ gimp_int_radio_group_new (gboolean in_frame, * @radio_button: Pointer to a #GtkRadioButton. * @item_data: The @item_data of the radio button you want to select. * - * DEPRECATED. Use gimp_int_radio_group_set_active() instead. - * - * Calls gtk_toggle_button_set_active() with the radio button that was created - * with a matching @item_data. + * Calls gtk_toggle_button_set_active() with the radio button that was + * created with a matching @item_data. **/ void gimp_radio_group_set_active (GtkRadioButton *radio_button, diff --git a/libgimpwidgets/gimpwidgets.h b/libgimpwidgets/gimpwidgets.h index aa10c06fd3..75ff235bbc 100644 --- a/libgimpwidgets/gimpwidgets.h +++ b/libgimpwidgets/gimpwidgets.h @@ -83,7 +83,6 @@ void gimp_int_option_menu_set_sensitive (GtkOptionMenu *option_menu, gpointer callback_data); -#ifndef GIMP_DISABLE_DEPRECATED GtkWidget * gimp_option_menu_new (gboolean menu_only, /* specify menu items as va_list: @@ -110,14 +109,14 @@ GtkWidget * gimp_option_menu_new2 (gboolean menu_only, void gimp_option_menu_set_history (GtkOptionMenu *option_menu, gpointer item_data); + typedef gboolean (*GimpOptionMenuSensitivityCallback) (gpointer item_data, gpointer callback_data); + void gimp_option_menu_set_sensitive (GtkOptionMenu *option_menu, GimpOptionMenuSensitivityCallback callback, gpointer callback_data); -#endif /* GIMP_DISABLE_DEPRECATED */ - GtkWidget * gimp_int_radio_group_new (gboolean in_frame, const gchar *frame_title, @@ -133,10 +132,10 @@ GtkWidget * gimp_int_radio_group_new (gboolean in_frame, ...); -void gimp_int_radio_group_set_active (GtkRadioButton *radio_button, - gint item_data); +void gimp_int_radio_group_set_active (GtkRadioButton *radio_button, + gint item_data); + -#ifndef GIMP_DISABLE_DEPRECATED GtkWidget * gimp_radio_group_new (gboolean in_frame, const gchar *frame_title, @@ -163,9 +162,9 @@ GtkWidget * gimp_radio_group_new2 (gboolean in_frame, */ ...); + void gimp_radio_group_set_active (GtkRadioButton *radio_button, gpointer item_data); -#endif /* GIMP_DISABLE_DEPRECATED */ GtkWidget * gimp_spin_button_new (/* return value: */