changed GimpHelpFunc typedef: - renamed "const gchar *help_data" to "const
2003-08-23 Michael Natterer <mitch@gimp.org> * libgimpwidgets/gimpwidgetstypes.h: changed GimpHelpFunc typedef: - renamed "const gchar *help_data" to "const gchar *help_id". - added "gpointer help_data". * libgimpwidgets/gimphelpui.[ch]: added "gpointer help_data" to gimp_help_connect(). Removed all fiddling with html links and treat all help IDs as opaque identifiers. * app/core/gimptoolinfo.[ch]: changed "help_data" member to "help_id". * app/widgets/gimpitemfactory.[ch]: removed the "help_path" parameter from gimp_item_factory_new() since we don't fiddle with html file paths any more. Simplifies menu item help a lot. Renamed "help_data" member of struct GimpItemFactoryEntry to "help_id". * app/gui/plug-in-menus.c: changed accordingly. 3rd party plug-ins' menu item help IDs are now encoded as "help_path:help_id". * app/gui/file-open-menu.c * app/gui/file-save-menu.c: when constructing the <Load> and <Save> menus, take the resp. procedures' locale_domain and help_path into account. Fixes translation of 3rd party menu items. Also do the right thing for load/save procs which are implemented as temporary procedures (they are impossible to implement currently but it's nice to do the right thing anyway...). * app/widgets/gimphelp-ids.h: added GIMP_HELP_MAIN identifier. * libgimpwidgets/gimpdialog.[ch] * libgimpwidgets/gimpwidgets.[ch] * libgimp/gimpui.c * app/display/gimpdisplayshell.c * app/gui/gui.c * app/gui/about-dialog.c * app/gui/color-notebook.c * app/gui/dialogs-constructors.c * app/gui/file-dialog-utils.[ch] * app/gui/gradients-commands.c * app/gui/help-commands.c * app/gui/image-menu.c * app/gui/menus.c * app/gui/preferences-dialog.c * app/gui/tips-dialog.c * app/tools/gimpcolorpickertool.c * app/tools/gimpcroptool.c * app/tools/gimpcurvestool.c * app/tools/gimphistogramtool.c * app/tools/gimpimagemaptool.c * app/tools/gimplevelstool.c * app/tools/gimpmeasuretool.c * app/tools/gimptransformtool.c * app/widgets/gimperrorconsole.c * app/widgets/gimphelp.[ch] * app/widgets/gimpmenufactory.[ch] * app/widgets/gimptexteditor.c * app/widgets/gimptoolbox.c * app/widgets/gimpviewabledialog.[ch] * plug-ins/common/CEL.c * plug-ins/common/CML_explorer.c * plug-ins/common/gee.c * plug-ins/common/gee_zoom.c * plug-ins/common/gqbist.c * plug-ins/common/spheredesigner.c * plug-ins/flame/flame.c * plug-ins/fp/fp_gtk.c * plug-ins/helpbrowser/helpbrowser.c * plug-ins/ifscompose/ifscompose.c * plug-ins/imagemap/imap_main.c: changed accordingly. Removed trailing whitespace all over the place.
This commit is contained in:

committed by
Michael Natterer

parent
9a52f49904
commit
ba70ce9a10
@ -136,7 +136,7 @@ gimp_dialog_close (GtkDialog *dialog)
|
||||
* gtk_window_set_wmclass(). The @wmclass_class will be
|
||||
* automatically set to "Gimp".
|
||||
* @help_func: The function which will be called if the user presses "F1".
|
||||
* @help_data: The data pointer which will be passed to @help_func.
|
||||
* @help_id: The help_id which will be passed to @help_func.
|
||||
* @position: The dialog's initial position which will be set with
|
||||
* gtk_window_set_position().
|
||||
* @allow_shrink: The dialog's @allow_shrink flag, ...
|
||||
@ -158,7 +158,7 @@ GtkWidget *
|
||||
gimp_dialog_new (const gchar *title,
|
||||
const gchar *wmclass_name,
|
||||
GimpHelpFunc help_func,
|
||||
const gchar *help_data,
|
||||
const gchar *help_id,
|
||||
GtkWindowPosition position,
|
||||
gint allow_shrink,
|
||||
gint allow_grow,
|
||||
@ -184,7 +184,7 @@ gimp_dialog_new (const gchar *title,
|
||||
dialog = gimp_dialog_newv (title,
|
||||
wmclass_name,
|
||||
help_func,
|
||||
help_data,
|
||||
help_id,
|
||||
position,
|
||||
allow_shrink,
|
||||
allow_grow,
|
||||
@ -204,7 +204,7 @@ gimp_dialog_new (const gchar *title,
|
||||
* gtk_window_set_wmclass(). The @wmclass_class will be
|
||||
* automatically set to "Gimp".
|
||||
* @help_func: The function which will be called if the user presses "F1".
|
||||
* @help_data: The data pointer which will be passed to @help_func.
|
||||
* @help_id: The help_id which will be passed to @help_func.
|
||||
* @position: The dialog's initial position which will be set with
|
||||
* gtk_window_set_position().
|
||||
* @allow_shrink: The dialog's @allow_shrink flag, ...
|
||||
@ -226,7 +226,7 @@ GtkWidget *
|
||||
gimp_dialog_newv (const gchar *title,
|
||||
const gchar *wmclass_name,
|
||||
GimpHelpFunc help_func,
|
||||
const gchar *help_data,
|
||||
const gchar *help_id,
|
||||
GtkWindowPosition position,
|
||||
gint allow_shrink,
|
||||
gint allow_grow,
|
||||
@ -256,7 +256,7 @@ gimp_dialog_newv (const gchar *title,
|
||||
|
||||
/* connect the "F1" help key */
|
||||
if (help_func)
|
||||
gimp_help_connect (dialog, help_func, help_data);
|
||||
gimp_help_connect (dialog, help_func, help_id, dialog);
|
||||
|
||||
return dialog;
|
||||
}
|
||||
|
Reference in New Issue
Block a user