diff --git a/ChangeLog b/ChangeLog index 155aa92f1d..e3dfbd0db3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2000-05-31 Michael Natterer + + * app/gimpunit.c + * libgimp/*: all libgimp headers are included via gimp.h or + gimpui.h, so include there and in the *.c files. + Various cleanups. + Wed May 31 00:43:09 CEST 2000 Stanislav Brabec * tips/gimp_tips.cs.txt: Updated translation. diff --git a/app/core/gimpunit.c b/app/core/gimpunit.c index 5c93e81569..b09350fe07 100644 --- a/app/core/gimpunit.c +++ b/app/core/gimpunit.c @@ -20,22 +20,27 @@ */ #include "config.h" + #include #include +#include + +#include "unitrc.h" + +#include "app_procs.h" +#include "gimprc.h" + /* NOTE: * * one of our header files is in libgimp/ (see the note there) */ #include "libgimp/gimpunit.h" - -#include "unitrc.h" - -#include "app_procs.h" -#include "gimprc.h" -#include "libgimp/gimpintl.h" #include "libgimp/gimpenv.h" +#include "libgimp/gimpintl.h" + + /* internal structures */ typedef struct diff --git a/app/gimpunit.c b/app/gimpunit.c index 5c93e81569..b09350fe07 100644 --- a/app/gimpunit.c +++ b/app/gimpunit.c @@ -20,22 +20,27 @@ */ #include "config.h" + #include #include +#include + +#include "unitrc.h" + +#include "app_procs.h" +#include "gimprc.h" + /* NOTE: * * one of our header files is in libgimp/ (see the note there) */ #include "libgimp/gimpunit.h" - -#include "unitrc.h" - -#include "app_procs.h" -#include "gimprc.h" -#include "libgimp/gimpintl.h" #include "libgimp/gimpenv.h" +#include "libgimp/gimpintl.h" + + /* internal structures */ typedef struct diff --git a/devel-docs/libgimp/libgimp-decl.txt b/devel-docs/libgimp/libgimp-decl.txt index 6f99cebeba..2bbfb75dc4 100644 --- a/devel-docs/libgimp/libgimp-decl.txt +++ b/devel-docs/libgimp/libgimp-decl.txt @@ -8,11 +8,11 @@ GIMP_MICRO_VERSION -#define GIMP_MICRO_VERSION (22) +#define GIMP_MICRO_VERSION (23) GIMP_VERSION -#define GIMP_VERSION "1.1.22" +#define GIMP_VERSION "1.1.23" GIMP_CHECK_VERSION diff --git a/libgimp/gimp.c b/libgimp/gimp.c index 17fbb9dfab..65d48d8c0e 100644 --- a/libgimp/gimp.c +++ b/libgimp/gimp.c @@ -16,6 +16,7 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #include "config.h" #include @@ -47,6 +48,8 @@ #define WAIT_ANY -1 #endif +#include + #ifndef G_OS_WIN32 #include "gimpsignal.h" #else diff --git a/libgimp/gimpchainbutton.c b/libgimp/gimpchainbutton.c index 2f4650e95a..7e48889057 100644 --- a/libgimp/gimpchainbutton.c +++ b/libgimp/gimpchainbutton.c @@ -20,7 +20,10 @@ * Boston, MA 02111-1307, USA. */ +#include + #include "gimpchainbutton.h" + #include "pixmaps/chain.xpm" static gchar **gimp_chain_xpm[] = diff --git a/libgimp/gimpchainbutton.h b/libgimp/gimpchainbutton.h index 004a265912..8942471140 100644 --- a/libgimp/gimpchainbutton.h +++ b/libgimp/gimpchainbutton.h @@ -31,10 +31,6 @@ #ifndef __GIMP_CHAIN_BUTTON_H__ #define __GIMP_CHAIN_BUTTON_H__ - -#include - - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -80,16 +76,15 @@ struct _GimpChainButtonClass }; -GtkType gimp_chain_button_get_type (void); -GtkWidget* gimp_chain_button_new (GimpChainPosition position); -void gimp_chain_button_set_active (GimpChainButton *gcb, - gboolean is_active); -gboolean gimp_chain_button_get_active (GimpChainButton *gcb); +GtkType gimp_chain_button_get_type (void); +GtkWidget * gimp_chain_button_new (GimpChainPosition position); +void gimp_chain_button_set_active (GimpChainButton *gcb, + gboolean is_active); +gboolean gimp_chain_button_get_active (GimpChainButton *gcb); #ifdef __cplusplus } #endif /* __cplusplus */ - #endif /* __CHAIN_BUTTON_H__ */ diff --git a/libgimp/gimpcolorbutton.c b/libgimp/gimpcolorbutton.c index 06bb1b46f2..65d00ccdd2 100644 --- a/libgimp/gimpcolorbutton.c +++ b/libgimp/gimpcolorbutton.c @@ -30,6 +30,8 @@ #include "config.h" +#include + #include "gimp.h" #include "gimpcolorbutton.h" #include "gimplimits.h" diff --git a/libgimp/gimpcolorbutton.h b/libgimp/gimpcolorbutton.h index 6c925b56d4..124cbf954b 100644 --- a/libgimp/gimpcolorbutton.h +++ b/libgimp/gimpcolorbutton.h @@ -29,8 +29,6 @@ #ifndef __GIMP_COLOR_BUTTON_H__ #define __GIMP_COLOR_BUTTON_H__ -#include - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -53,22 +51,22 @@ struct _GimpColorButtonClass }; -GtkType gimp_color_button_get_type (void); -GtkWidget* gimp_color_button_new (gchar *title, - gint width, - gint height, - guchar *color, - gint bpp); -GtkWidget* gimp_color_button_double_new (gchar *title, - gint width, - gint height, - gdouble *color, - gint bpp); -void gimp_color_button_update (GimpColorButton *gcb); +GtkType gimp_color_button_get_type (void); +GtkWidget * gimp_color_button_new (gchar *title, + gint width, + gint height, + guchar *color, + gint bpp); +GtkWidget * gimp_color_button_double_new (gchar *title, + gint width, + gint height, + gdouble *color, + gint bpp); +void gimp_color_button_update (GimpColorButton *gcb); + #ifdef __cplusplus } #endif /* __cplusplus */ - #endif /* __COLOR_BUTTON_H__ */ diff --git a/libgimp/gimpcolordisplay.h b/libgimp/gimpcolordisplay.h index 1fcef9c610..60428be2e1 100644 --- a/libgimp/gimpcolordisplay.h +++ b/libgimp/gimpcolordisplay.h @@ -22,29 +22,35 @@ #include #include -#include "gimpparasite.h" +#include + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/* For information look at the html documentation */ -typedef void (* GimpColorDisplayInit) (void); -typedef gpointer (* GimpColorDisplayNew) (gint type); -typedef gpointer (* GimpColorDisplayClone) (gpointer cd_ID); -typedef void (* GimpColorDisplayConvert) (gpointer cd_ID, - guchar *buf, - gint width, - gint height, - gint bpp, - gint bpl); -typedef void (* GimpColorDisplayDestroy) (gpointer cd_ID); -typedef void (* GimpColorDisplayFinalize) (void); -typedef void (* GimpColorDisplayLoadState) (gpointer cd_ID, - GimpParasite *state); -typedef GimpParasite * (* GimpColorDisplaySaveState) (gpointer cd_ID); -typedef void (* GimpColorDisplayConfigure) (gpointer cd_ID, - GFunc ok_func, - gpointer ok_data, - GFunc cancel_func, - gpointer cancel_data); -typedef void (* GimpColorDisplayConfigureCancel) (gpointer cd_ID); +typedef void (* GimpColorDisplayInit) (void); +typedef gpointer (* GimpColorDisplayNew) (gint type); +typedef gpointer (* GimpColorDisplayClone) (gpointer cd_ID); +typedef void (* GimpColorDisplayConvert) (gpointer cd_ID, + guchar *buf, + gint width, + gint height, + gint bpp, + gint bpl); +typedef void (* GimpColorDisplayDestroy) (gpointer cd_ID); +typedef void (* GimpColorDisplayFinalize) (void); +typedef void (* GimpColorDisplayLoadState) (gpointer cd_ID, + GimpParasite *state); +typedef GimpParasite * (* GimpColorDisplaySaveState) (gpointer cd_ID); +typedef void (* GimpColorDisplayConfigure) (gpointer cd_ID, + GFunc ok_func, + gpointer ok_data, + GFunc cancel_func, + gpointer cancel_data); +typedef void (* GimpColorDisplayConfigureCancel) (gpointer cd_ID); typedef struct _GimpColorDisplayMethods GimpColorDisplayMethods; @@ -73,4 +79,9 @@ gboolean gimp_color_display_register (const gchar *name, G_MODULE_EXPORT gboolean gimp_color_display_unregister (const gchar *name); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* __GIMP_COLOR_DISPLAY_H__ */ diff --git a/libgimp/gimpcolorselector.h b/libgimp/gimpcolorselector.h index a21b5fc227..d01cce4ab5 100644 --- a/libgimp/gimpcolorselector.h +++ b/libgimp/gimpcolorselector.h @@ -21,6 +21,10 @@ #ifndef __COLOR_SELECTOR_H__ #define __COLOR_SELECTOR_H__ +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + /* For information look at the html documentation */ @@ -56,6 +60,7 @@ struct _GimpColorSelectorMethods typedef gpointer GimpColorSelectorID; + #ifndef __COLOR_NOTEBOOK_C__ /* Bypass when compiling the source for these functions. @@ -66,10 +71,15 @@ GimpColorSelectorID gimp_color_selector_register (const gchar *name, typedef void (* GimpColorSelectorFinishedCB) (gpointer finished_data); -gboolean gimp_color_selector_unregister (GimpColorSelectorID id, +gboolean gimp_color_selector_unregister (GimpColorSelectorID id, GimpColorSelectorFinishedCB finished_cb, gpointer finished_data); #endif /* !__COLOR_NOTEBOOK_C__ */ + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* __COLOR_SELECTOR_H__ */ diff --git a/libgimp/gimpcolorspace.h b/libgimp/gimpcolorspace.h index 129e4b1f74..0d8c6056f7 100644 --- a/libgimp/gimpcolorspace.h +++ b/libgimp/gimpcolorspace.h @@ -20,6 +20,13 @@ #ifndef __GIMPCOLORSPACE_H__ #define __GIMPCOLORSPACE_H__ +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/* For information look into the C source or the html documentation */ + + /* Color conversion routines */ void gimp_rgb_to_hsv (gint *red /* returns hue */, @@ -65,4 +72,9 @@ void gimp_hsv_to_rgb4 (guchar *rgb, (g) * INTENSITY_GREEN + \ (b) * INTENSITY_BLUE + 0.001) + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* __GIMPCOLORSPACE_H__ */ diff --git a/libgimp/gimpcompat.h b/libgimp/gimpcompat.h index d4597f9627..07eee382a5 100644 --- a/libgimp/gimpcompat.h +++ b/libgimp/gimpcompat.h @@ -23,6 +23,7 @@ extern "C" { #endif /* __cplusplus */ + /* some compatibility defines for older plug-ins */ #ifndef GIMP_DISABLE_COMPAT_H @@ -77,6 +78,7 @@ extern "C" { #endif /* GIMP_DISABLE_COMPAT_H */ + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libgimp/gimpdialog.c b/libgimp/gimpdialog.c index a39a094005..c76d897680 100644 --- a/libgimp/gimpdialog.c +++ b/libgimp/gimpdialog.c @@ -19,7 +19,10 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ -#include "libgimp/gimpdialog.h" + +#include + +#include "gimpdialog.h" #include "pixmaps/wilber.xpm" diff --git a/libgimp/gimpdialog.h b/libgimp/gimpdialog.h index f8297caa5a..003d81601b 100644 --- a/libgimp/gimpdialog.h +++ b/libgimp/gimpdialog.h @@ -19,18 +19,19 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMP_DIALOG_H__ #define __GIMP_DIALOG_H__ -#include - -#include "gimphelpui.h" -#include "gimpunit.h" +#include #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ +/* For information look into the C source or the html documentation */ + + GtkWidget * gimp_dialog_new (const gchar *title, const gchar *wmclass_name, GimpHelpFunc help_func, @@ -83,24 +84,9 @@ void gimp_dialog_create_action_area (GtkDialog *dialog, void gimp_dialog_create_action_areav (GtkDialog *dialog, va_list args); + #ifdef __cplusplus } #endif /* __cplusplus */ #endif /* __GIMP_DIALOG_H__ */ - - - - - - - - - - - - - - - - diff --git a/libgimp/gimpenv.h b/libgimp/gimpenv.h index d40db14ab1..e1e6e91fde 100644 --- a/libgimp/gimpenv.h +++ b/libgimp/gimpenv.h @@ -30,6 +30,7 @@ extern "C" { /* For information look into the C source or the html documentation */ + gchar * gimp_directory (void); gchar * gimp_personal_rc_file (gchar *basename); gchar * gimp_data_directory (void); @@ -44,6 +45,7 @@ void gimp_path_free (GList *path); gchar * gimp_path_get_user_writable_dir (GList *path); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libgimp/gimpexport.h b/libgimp/gimpexport.h index 4062bb95de..9303bc57e6 100644 --- a/libgimp/gimpexport.h +++ b/libgimp/gimpexport.h @@ -23,13 +23,15 @@ #ifndef __GIMP_EXPORT_H__ #define __GIMP_EXPORT_H__ -#include - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -typedef enum { +/* For information look into the C source or the html documentation */ + + +typedef enum +{ CAN_HANDLE_RGB = 1 << 0, CAN_HANDLE_GRAY = 1 << 1, CAN_HANDLE_INDEXED = 1 << 2, @@ -51,8 +53,9 @@ GimpExportReturnType gimp_export_image (gint32 *image_ID, gchar *format_name, GimpExportCapabilities capabilities); + #ifdef __cplusplus } #endif /* __cplusplus */ -#endif +#endif /* __GIMP_EXPORT_H__ */ diff --git a/libgimp/gimpfileselection.c b/libgimp/gimpfileselection.c index 1215f1fa9e..a118965654 100644 --- a/libgimp/gimpfileselection.c +++ b/libgimp/gimpfileselection.c @@ -30,6 +30,8 @@ #endif #include +#include + #include "gimpfileselection.h" #include "libgimp-intl.h" @@ -37,6 +39,7 @@ #include "pixmaps/yes.xpm" #include "pixmaps/no.xpm" + #ifdef G_OS_WIN32 # ifndef S_ISDIR # define S_ISDIR(m) ((m) & _S_IFDIR) diff --git a/libgimp/gimpfileselection.h b/libgimp/gimpfileselection.h index 628564067c..3f1806ebf4 100644 --- a/libgimp/gimpfileselection.h +++ b/libgimp/gimpfileselection.h @@ -23,12 +23,13 @@ #ifndef __GIMP_FILE_SELECTION_H__ #define __GIMP_FILE_SELECTION_H__ -#include - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ +/* For information look into the C source or the html documentation */ + + #define GIMP_TYPE_FILE_SELECTION (gimp_file_selection_get_type ()) #define GIMP_FILE_SELECTION(obj) (GTK_CHECK_CAST ((obj), GIMP_TYPE_FILE_SELECTION, GimpFileSelection)) #define GIMP_FILE_SELECTION_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FILE_SELECTION, GimpFileSelectionClass)) @@ -79,6 +80,7 @@ gchar* gimp_file_selection_get_filename (GimpFileSelection *gfs); void gimp_file_selection_set_filename (GimpFileSelection *gfs, gchar *filename); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libgimp/gimphelp_pdb.c b/libgimp/gimphelp_pdb.c index 4749654e38..6117c67493 100644 --- a/libgimp/gimphelp_pdb.c +++ b/libgimp/gimphelp_pdb.c @@ -1,7 +1,7 @@ /* LIBGIMP - The GIMP Library * Copyright (C) 1995 Spencer Kimball and Peter Mattis * - * gimphelp.c + * gimphelp_pdb.c * Copyright (C) 2000 Michael Natterer * * This library is free software; you can redistribute it and/or diff --git a/libgimp/gimphelpui.c b/libgimp/gimphelpui.c index 1dfa20aa8e..17913137d2 100644 --- a/libgimp/gimphelpui.c +++ b/libgimp/gimphelpui.c @@ -19,6 +19,7 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #include #include diff --git a/libgimp/gimphelpui.h b/libgimp/gimphelpui.h index c2501399d8..2f4e295d0b 100644 --- a/libgimp/gimphelpui.h +++ b/libgimp/gimphelpui.h @@ -19,15 +19,17 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMP_HELP_UI_H__ #define __GIMP_HELP_UI_H__ -#include - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ +/* For information look into the C source or the html documentation */ + + typedef void (* GimpHelpFunc) (gchar *help_data); void gimp_help_init (void); @@ -54,13 +56,9 @@ void gimp_help_set_help_data (GtkWidget *widget, /* activate the context help inspector */ void gimp_context_help (void); + #ifdef __cplusplus } #endif /* __cplusplus */ #endif /* __GIMP_HELP_UI_H__ */ - - - - - diff --git a/libgimp/gimpintl.h b/libgimp/gimpintl.h index 677fa440d9..7258ccd82f 100644 --- a/libgimp/gimpintl.h +++ b/libgimp/gimpintl.h @@ -1,7 +1,7 @@ /* LIBGIMP - The GIMP Library * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * - * libgimp-intl.h + * gimpintl.h * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,15 +18,17 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMPINTL_H__ #define __GIMPINTL_H__ #include #include -/* Copied from gnome-i18n.h by Tom Tromey * - * Heavily modified by Daniel Egger * - * So be sure to hit me instead of him if something is wrong here */ +/* Copied from gnome-i18n.h by Tom Tromey + * Heavily modified by Daniel Egger + * So be sure to hit me instead of him if something is wrong here + */ #ifndef LOCALEDIR #define LOCALEDIR g_strconcat (gimp_data_directory (), \ diff --git a/libgimp/gimplimits.h b/libgimp/gimplimits.h index f4c4d2201e..e7c19bc5b5 100644 --- a/libgimp/gimplimits.h +++ b/libgimp/gimplimits.h @@ -19,9 +19,11 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMP_LIMITS_H__ #define __GIMP_LIMITS_H__ + /* pixel sizes */ #define GIMP_MIN_IMAGE_SIZE 1 @@ -42,4 +44,5 @@ #define GIMP_CHECK_DARK 0.4 /* corresponds to GRAY_CHECKS as */ #define GIMP_CHECK_LIGHT 0.6 /* defined in app/image_render.c */ + #endif /* __GIMP_LIMITS_H__ */ diff --git a/libgimp/gimpmath.h b/libgimp/gimpmath.h index e2a855127c..228a647cc1 100644 --- a/libgimp/gimpmath.h +++ b/libgimp/gimpmath.h @@ -20,19 +20,21 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMPMATH_H__ #define __GIMPMATH_H__ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - #include #ifdef G_OS_WIN32 #include #endif +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + + /* Some portability enhancing stuff. For use both by the gimp app * as well as plug-ins and modules. * @@ -90,8 +92,9 @@ extern "C" { #endif #endif + #ifdef __cplusplus } #endif /* __cplusplus */ -#endif /* __GIMPMATH_H__ */ +#endif /* __GIMPMATH_H__ */ diff --git a/libgimp/gimpmatrix.c b/libgimp/gimpmatrix.c index 530b741a9d..05ac624b53 100644 --- a/libgimp/gimpmatrix.c +++ b/libgimp/gimpmatrix.c @@ -20,9 +20,12 @@ * Boston, MA 02111-1307, USA. */ +#include + #include "gimpmath.h" #include "gimpmatrix.h" + #define EPSILON 1e-6 diff --git a/libgimp/gimpmatrix.h b/libgimp/gimpmatrix.h index ddacdbdcb1..4c08e77e53 100644 --- a/libgimp/gimpmatrix.h +++ b/libgimp/gimpmatrix.h @@ -23,12 +23,11 @@ #ifndef __GIMP_MATRIX_H__ #define __GIMP_MATRIX_H__ -#include - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ + typedef gdouble GimpMatrix3[3][3]; typedef gdouble GimpMatrix4[4][4]; @@ -68,8 +67,9 @@ void gimp_matrix4_to_deg (GimpMatrix4 matrix, gdouble *b, gdouble *c); + #ifdef __cplusplus } #endif /* __cplusplus */ -#endif /* __GIMP_MATRIX_H__ */ +#endif /* __GIMP_MATRIX_H__ */ diff --git a/libgimp/gimpmenu.h b/libgimp/gimpmenu.h index 1cb781d3d7..97096adcd7 100644 --- a/libgimp/gimpmenu.h +++ b/libgimp/gimpmenu.h @@ -16,69 +16,66 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMP_MENU_H__ #define __GIMP_MENU_H__ - -#include - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ - -typedef gint (*GimpConstraintFunc) (gint32 image_id, - gint32 drawable_id, - gpointer data); -typedef void (*GimpMenuCallback) (gint32 id, - gpointer data); +typedef gint (* GimpConstraintFunc) (gint32 image_id, + gint32 drawable_id, + gpointer data); +typedef void (* GimpMenuCallback) (gint32 id, + gpointer data); /* Popup the brush dialog interactively */ -typedef void (* GRunBrushCallback) (gchar *name, - gdouble opacity, - gint spacing, - gint paint_mode, - gint width, - gint height, - gchar *mask_data, - gboolean dialog_closing, - gpointer user_data); +typedef void (* GRunBrushCallback) (gchar *name, + gdouble opacity, + gint spacing, + gint paint_mode, + gint width, + gint height, + gchar *mask_data, + gboolean dialog_closing, + gpointer user_data); /* Popup the pattern dialog */ -typedef void (*GRunPatternCallback) (gchar *name, - gint width, - gint height, - gint bpp, - gchar *mask_data, - gboolean dialog_closing, - gpointer user_data); +typedef void (* GRunPatternCallback) (gchar *name, + gint width, + gint height, + gint bpp, + gchar *mask_data, + gboolean dialog_closing, + gpointer user_data); /* Popup the gradient dialog */ -typedef void (*GRunGradientCallback) (gchar *name, - gint width, - gdouble *grad_data, - gboolean dialog_closing, - gpointer user_data); +typedef void (* GRunGradientCallback) (gchar *name, + gint width, + gdouble *grad_data, + gboolean dialog_closing, + gpointer user_data); -GtkWidget* gimp_image_menu_new (GimpConstraintFunc constraint, - GimpMenuCallback callback, - gpointer data, - gint32 active_image); -GtkWidget* gimp_layer_menu_new (GimpConstraintFunc constraint, - GimpMenuCallback callback, - gpointer data, - gint32 active_layer); -GtkWidget* gimp_channel_menu_new (GimpConstraintFunc constraint, - GimpMenuCallback callback, - gpointer data, - gint32 active_channel); -GtkWidget* gimp_drawable_menu_new (GimpConstraintFunc constraint, - GimpMenuCallback callback, - gpointer data, - gint32 active_drawable); +GtkWidget * gimp_image_menu_new (GimpConstraintFunc constraint, + GimpMenuCallback callback, + gpointer data, + gint32 active_image); +GtkWidget * gimp_layer_menu_new (GimpConstraintFunc constraint, + GimpMenuCallback callback, + gpointer data, + gint32 active_layer); +GtkWidget * gimp_channel_menu_new (GimpConstraintFunc constraint, + GimpMenuCallback callback, + gpointer data, + gint32 active_channel); +GtkWidget * gimp_drawable_menu_new (GimpConstraintFunc constraint, + GimpMenuCallback callback, + gpointer data, + gint32 active_drawable); gpointer gimp_interactive_selection_brush (gchar *dialogname, @@ -168,9 +165,9 @@ gboolean gimp_gradient_set_popup (gpointer popup_p gchar *pname); gboolean gimp_gradient_close_popup (gpointer popup_pnt); + #ifdef __cplusplus } #endif /* __cplusplus */ - #endif /* __GIMP_MENU_H__ */ diff --git a/libgimp/gimpmodule.h b/libgimp/gimpmodule.h index cbd550210e..e56c76aab3 100644 --- a/libgimp/gimpmodule.h +++ b/libgimp/gimpmodule.h @@ -23,8 +23,13 @@ #include +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + /* For information look at the html documentation */ + typedef enum { GIMP_MODULE_OK, @@ -50,6 +55,7 @@ struct _GimpModuleInfo typedef GimpModuleStatus (* GimpModuleInitFunc) (GimpModuleInfo **module_info); + #ifndef MODULE_COMPILATION /* On Win32 this declaration clashes with the definition @@ -69,6 +75,7 @@ typedef void (* GimpModuleUnloadFunc) (gpointer shutdown_data, GimpModuleCompletedCB completed_cb, gpointer completed_data); + #ifndef MODULE_COMPILATION /* The same as for module_init. @@ -77,4 +84,9 @@ GimpModuleUnloadFunc module_unload; #endif /* ! MODULE_COMPILATION */ + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* __GIMPMODULE_H__ */ diff --git a/libgimp/gimpparasite.h b/libgimp/gimpparasite.h index ccaf5c7aa0..f7f4d291e3 100644 --- a/libgimp/gimpparasite.h +++ b/libgimp/gimpparasite.h @@ -19,6 +19,7 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMP_PARASITE_H__ #define __GIMP_PARASITE_H__ @@ -26,6 +27,9 @@ extern "C" { #endif /* __cplusplus */ +/* For information look into the C source or the html documentation */ + + #define GIMP_PARASITE_PERSISTENT 1 #define GIMP_PARASITE_UNDOABLE 2 diff --git a/libgimp/gimpparasiteio.h b/libgimp/gimpparasiteio.h index a8771ab94a..469dcf35a4 100644 --- a/libgimp/gimpparasiteio.h +++ b/libgimp/gimpparasiteio.h @@ -19,6 +19,7 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMP_PARASITE_IO_H__ #define __GIMP_PARASITE_IO_H__ @@ -26,6 +27,9 @@ extern "C" { #endif /* __cplusplus */ +/* For information look into the C source or the html documentation */ + + /* Data structures for various standard parasites used by plug-ins and * the GIMP core, and functions to build and parse their string * representations. diff --git a/libgimp/gimppatheditor.c b/libgimp/gimppatheditor.c index ce4902760b..1c95808c4a 100644 --- a/libgimp/gimppatheditor.c +++ b/libgimp/gimppatheditor.c @@ -19,8 +19,11 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #include +#include + #include "gimppatheditor.h" #include "libgimp/gimpfileselection.h" @@ -31,6 +34,7 @@ #include "pixmaps/raise.xpm" #include "pixmaps/lower.xpm" + /* forward declaration */ static void gimp_path_editor_select_callback (GtkWidget *widget, gpointer data); diff --git a/libgimp/gimppatheditor.h b/libgimp/gimppatheditor.h index 304b5bd5d6..dcdedb6463 100644 --- a/libgimp/gimppatheditor.h +++ b/libgimp/gimppatheditor.h @@ -19,15 +19,17 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMP_PATH_EDITOR_H__ #define __GIMP_PATH_EDITOR_H__ -#include - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ +/* For information look into the C source or the html documentation */ + + #define GIMP_TYPE_PATH_EDITOR (gimp_path_editor_get_type ()) #define GIMP_PATH_EDITOR(obj) (GTK_CHECK_CAST ((obj), GIMP_TYPE_PATH_EDITOR, GimpPathEditor)) #define GIMP_PATH_EDITOR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PATH_EDITOR, GimpPathEditorClass)) @@ -72,6 +74,7 @@ GtkWidget * gimp_path_editor_new (gchar *filesel_title, gchar * gimp_path_editor_get_path (GimpPathEditor *gpe); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libgimp/gimppixmap.c b/libgimp/gimppixmap.c index 8296a5e09f..85649a05e4 100644 --- a/libgimp/gimppixmap.c +++ b/libgimp/gimppixmap.c @@ -22,8 +22,11 @@ #include +#include + #include "gimppixmap.h" + struct _GimpPixmap { GtkPixmap pixmap; diff --git a/libgimp/gimppixmap.h b/libgimp/gimppixmap.h index eec51604bb..d5c7ef5d87 100644 --- a/libgimp/gimppixmap.h +++ b/libgimp/gimppixmap.h @@ -19,15 +19,17 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMP_PIXMAP_H__ #define __GIMP_PIXMAP_H__ -#include - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ +/* For information look into the C source or the html documentation */ + + #define GIMP_TYPE_PIXMAP (gimp_pixmap_get_type ()) #define GIMP_PIXMAP(obj) (GTK_CHECK_CAST ((obj), GIMP_TYPE_PIXMAP, GimpPixmap)) #define GIMP_PIXMAP_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PIXMAP, GimpPixmapClass)) @@ -48,8 +50,9 @@ GtkWidget * gimp_pixmap_new (gchar **xpm_data); void gimp_pixmap_set (GimpPixmap *pixmap, gchar **xpm_data); + #ifdef __cplusplus } #endif /* __cplusplus */ -#endif /* __GIMP_PIXMAP_H__ */ +#endif /* __GIMP_PIXMAP_H__ */ diff --git a/libgimp/gimpprotocol.h b/libgimp/gimpprotocol.h index 25802f7de7..4595d53919 100644 --- a/libgimp/gimpprotocol.h +++ b/libgimp/gimpprotocol.h @@ -16,10 +16,16 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMP_PROTOCOL_H__ #define __GIMP_PROTOCOL_H__ -#include +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/* For information look into the C source or the html documentation */ + /* Increment every time the protocol changes */ @@ -206,4 +212,8 @@ gboolean gp_extension_ack_write (GIOChannel *channel); gboolean gp_request_wakeups_write (GIOChannel *channel); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* __GIMP_PROTOCOL_H__ */ diff --git a/libgimp/gimpquerybox.c b/libgimp/gimpquerybox.c index 5dc1656a2e..06e2db30bb 100644 --- a/libgimp/gimpquerybox.c +++ b/libgimp/gimpquerybox.c @@ -20,18 +20,21 @@ * Boston, MA 02111-1307, USA. */ -#include "gimpquerybox.h" +#include "config.h" + +#include #include "gimpdialog.h" #include "gimppixmap.h" +#include "gimpquerybox.h" #include "gimpsizeentry.h" #include "gimpwidgets.h" -#include "config.h" #include "libgimp-intl.h" #include "pixmaps/eek.xpm" + /* * String, integer, double and size query boxes */ diff --git a/libgimp/gimpquerybox.h b/libgimp/gimpquerybox.h index cba746350f..0ffe60b128 100644 --- a/libgimp/gimpquerybox.h +++ b/libgimp/gimpquerybox.h @@ -19,14 +19,18 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMP_QUERY_BOX_H__ #define __GIMP_QUERY_BOX_H__ -#include +#include -#include "gimphelpui.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/* For information look into the C source or the html documentation */ -#include "gimpunit.h" /* query box callback prototypes */ typedef void (* GimpQueryStringCallback) (GtkWidget *query_box, @@ -114,4 +118,9 @@ GtkWidget * gimp_query_boolean_box (gchar *title, GimpQueryBooleanCallback callback, gpointer data); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* __GIMP_QUERY_BOX_H__ */ diff --git a/libgimp/gimpsignal.c b/libgimp/gimpsignal.c index e7f35b1bc7..f25e542ac0 100644 --- a/libgimp/gimpsignal.c +++ b/libgimp/gimpsignal.c @@ -19,6 +19,8 @@ * $Revision$ */ +#include + #include "gimpsignal.h" diff --git a/libgimp/gimpsignal.h b/libgimp/gimpsignal.h index e74b1e6c9c..5d4c1eb6f2 100644 --- a/libgimp/gimpsignal.h +++ b/libgimp/gimpsignal.h @@ -15,22 +15,26 @@ * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. - * - * $Revision$ */ + #ifndef __GIMP_SIGNAL_H__ #define __GIMP_SIGNAL_H__ +#include + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/* For information look into the C source or the html documentation */ + + /* A gimp-level interface to a Posix.1-compliant signal package lives here * For 1.2, this gimp-level interface mostly passes through to posix calls * without modification. Certain calls manipulate struct sigaction in * ways useful to Gimp. */ -#include - -#include - #ifdef __EMX__ /* hope this is right for OS/2 */ #define SA_RESTART SA_SYSV @@ -54,4 +58,9 @@ GimpSignalHandlerFunc gimp_signal_private (gint signum, */ #define gimp_signal_syscallrestart(signum,handler) gimp_signal_private ((signum), (handler), SA_RESTART) + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* __GIMP_SIGNAL_H__ */ diff --git a/libgimp/gimpsizeentry.c b/libgimp/gimpsizeentry.c index 3cdebc946f..2253022e54 100644 --- a/libgimp/gimpsizeentry.c +++ b/libgimp/gimpsizeentry.c @@ -21,10 +21,13 @@ * Boston, MA 02111-1307, USA. */ +#include + #include "gimplimits.h" #include "gimpsizeentry.h" #include "gimpunitmenu.h" + #define SIZE_MAX_VALUE 500000.0 static void gimp_size_entry_unit_callback (GtkWidget *widget, diff --git a/libgimp/gimpsizeentry.h b/libgimp/gimpsizeentry.h index bbf86c4972..d3b5935c12 100644 --- a/libgimp/gimpsizeentry.h +++ b/libgimp/gimpsizeentry.h @@ -20,17 +20,19 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMP_SIZE_ENTRY_H__ #define __GIMP_SIZE_ENTRY_H__ -#include - -#include "gimpunit.h" +#include #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ +/* For information look into the C source or the html documentation */ + + #define GIMP_TYPE_SIZE_ENTRY (gimp_size_entry_get_type ()) #define GIMP_SIZE_ENTRY(obj) (GTK_CHECK_CAST ((obj), GIMP_TYPE_SIZE_ENTRY, GimpSizeEntry)) #define GIMP_SIZE_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SIZE_ENTRY, GimpSizeEntryClass)) @@ -138,6 +140,7 @@ void gimp_size_entry_set_unit (GimpSizeEntry *gse, void gimp_size_entry_grab_focus (GimpSizeEntry *gse); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libgimp/gimpui.h b/libgimp/gimpui.h index a6d7fa9904..1851e1b411 100644 --- a/libgimp/gimpui.h +++ b/libgimp/gimpui.h @@ -16,6 +16,7 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMP_UI_H__ #define __GIMP_UI_H__ @@ -35,7 +36,19 @@ #include #include +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/* For information look into the C source or the html documentation */ + + void gimp_ui_init (gchar *prog_name, gboolean preview); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* __GIMP_UI_H__ */ diff --git a/libgimp/gimpunit.h b/libgimp/gimpunit.h index 0cc0d97eef..dbf9045672 100644 --- a/libgimp/gimpunit.h +++ b/libgimp/gimpunit.h @@ -30,12 +30,13 @@ #ifndef __GIMPUNIT_H__ #define __GIMPUNIT_H__ -#include - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ +/* For information look into the C source or the html documentation */ + + typedef enum { GIMP_UNIT_PIXEL = 0, @@ -50,7 +51,6 @@ typedef enum GIMP_UNIT_PERCENT = 65536 } GimpUnit; -/* For information look into the C source or the html documentation */ gint gimp_unit_get_number_of_units (void); gint gimp_unit_get_number_of_built_in_units (void); @@ -78,8 +78,9 @@ gchar * gimp_unit_get_abbreviation (GimpUnit unit); gchar * gimp_unit_get_singular (GimpUnit unit); gchar * gimp_unit_get_plural (GimpUnit unit); + #ifdef __cplusplus } #endif /* __cplusplus */ -#endif /* __GIMPUNIT_H__ */ +#endif /* __GIMPUNIT_H__ */ diff --git a/libgimp/gimpunit_pdb.c b/libgimp/gimpunit_pdb.c index 393b889bdb..3739063645 100644 --- a/libgimp/gimpunit_pdb.c +++ b/libgimp/gimpunit_pdb.c @@ -1,7 +1,7 @@ /* LIBGIMP - The GIMP Library * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * - * gimpunit.c + * gimpunit_pdb.c * Copyright (C) 1999 Michael Natterer * * This library is free software; you can redistribute it and/or diff --git a/libgimp/gimpunitmenu.c b/libgimp/gimpunitmenu.c index 5d6e267586..b61ee26b3b 100644 --- a/libgimp/gimpunitmenu.c +++ b/libgimp/gimpunitmenu.c @@ -19,13 +19,17 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #include "config.h" +#include + #include "gimpdialog.h" #include "gimpunitmenu.h" #include "libgimp-intl.h" + /* private functions */ static const gchar * gimp_unit_menu_build_string (gchar *format, GimpUnit unit); diff --git a/libgimp/gimpunitmenu.h b/libgimp/gimpunitmenu.h index 3875c82e83..1b688bbad1 100644 --- a/libgimp/gimpunitmenu.h +++ b/libgimp/gimpunitmenu.h @@ -19,17 +19,19 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMP_UNIT_MENU_H__ #define __GIMP_UNIT_MENU_H__ -#include - -#include "gimpunit.h" +#include #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ +/* For information look into the C source or the html documentation */ + + #define GIMP_TYPE_UNIT_MENU (gimp_unit_menu_get_type ()) #define GIMP_UNIT_MENU(obj) (GTK_CHECK_CAST ((obj), GIMP_TYPE_UNIT_MENU, GimpUnitMenu)) #define GIMP_UNIT_MENU_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_UNIT_MENU, GimpUnitMenuClass)) @@ -62,7 +64,6 @@ struct _GimpUnitMenuClass void (* unit_changed) (GimpUnitMenu *gum); }; -/* For information look into the C source or the html documentation */ GtkType gimp_unit_menu_get_type (void); @@ -77,6 +78,7 @@ void gimp_unit_menu_set_unit (GimpUnitMenu *gum, GimpUnit gimp_unit_menu_get_unit (GimpUnitMenu *gum); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libgimp/gimputils.h b/libgimp/gimputils.h index 54b9f2ed1f..a0f0aad12c 100644 --- a/libgimp/gimputils.h +++ b/libgimp/gimputils.h @@ -28,14 +28,15 @@ extern "C" { #endif /* __cplusplus */ +/* For information look into the C source or the html documentation */ + + /* * Right now all you find here is the g_strescape function out of * glib-1.3. We need its functionality, but don't want to rely on * that version being installed */ -/* For information look into the C source or the html documentation */ - #if (defined (GLIB_CHECK_VERSION) && GLIB_CHECK_VERSION (1,3,1)) #define gimp_strescape(string, exceptions) g_strescape (string, exceptions) #else @@ -43,8 +44,9 @@ gchar* gimp_strescape (const gchar *source, const gchar *exceptions); #endif /* GLIB <= 1.3 */ + #ifdef __cplusplus } #endif /* __cplusplus */ -#endif /* __GIMPUTILS_H__ */ +#endif /* __GIMPUTILS_H__ */ diff --git a/libgimp/gimpvector.c b/libgimp/gimpvector.c index f57dfb3d5d..446f58f6ad 100644 --- a/libgimp/gimpvector.c +++ b/libgimp/gimpvector.c @@ -25,9 +25,12 @@ /* A little collection of useful vector stuff */ /**********************************************/ +#include + #include "gimpmath.h" #include "gimpvector.h" + /*************************/ /* Some useful constants */ /*************************/ diff --git a/libgimp/gimpvector.h b/libgimp/gimpvector.h index 2e79f4e6a0..5de094967b 100644 --- a/libgimp/gimpvector.h +++ b/libgimp/gimpvector.h @@ -24,11 +24,12 @@ #ifndef __GIMP_VECTOR_H__ #define __GIMP_VECTOR_H__ -#include - #ifdef __cplusplus extern "C" { -#endif +#endif /* __cplusplus */ + +/* For information look into the C source or the html documentation */ + typedef struct _GimpVector2 GimpVector2; typedef struct _GimpVector3 GimpVector3; @@ -121,8 +122,9 @@ void gimp_vector_3d_to_2d (gint sx, GimpVector3 *vp, GimpVector3 *p); + #ifdef __cplusplus } -#endif +#endif /* __cplusplus */ #endif /* __GIMP_VECTOR_H__ */ diff --git a/libgimp/gimpwidgets.c b/libgimp/gimpwidgets.c index 887baff4af..5a39c6ac50 100644 --- a/libgimp/gimpwidgets.c +++ b/libgimp/gimpwidgets.c @@ -22,6 +22,8 @@ #include "config.h" +#include + #include "gimpchainbutton.h" #include "gimphelpui.h" #include "gimppixmap.h" @@ -31,6 +33,7 @@ #include "libgimp-intl.h" + /* * Widget Constructors */ diff --git a/libgimp/gimpwidgets.h b/libgimp/gimpwidgets.h index 2ad312dbd6..8e818637a4 100644 --- a/libgimp/gimpwidgets.h +++ b/libgimp/gimpwidgets.h @@ -19,16 +19,15 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMP_WIDGETS_H__ #define __GIMP_WIDGETS_H__ -#include - -#include "gimpsizeentry.h" +#include #ifdef __cplusplus extern "C" { -#endif +#endif /* __cplusplus */ /* For information look into the C source or the html documentation */ @@ -244,8 +243,9 @@ void gimp_table_attach_aligned (GtkTable *table, gint colspan, gboolean left_align); + #ifdef __cplusplus } -#endif +#endif /* __cplusplus */ #endif /* __GIMP_WIDGETS_H__ */ diff --git a/libgimp/gimpwire.c b/libgimp/gimpwire.c index c6958923d2..785ad29f65 100644 --- a/libgimp/gimpwire.c +++ b/libgimp/gimpwire.c @@ -36,6 +36,8 @@ #include #endif +#include + #include "gimpwire.h" diff --git a/libgimp/gimpwire.h b/libgimp/gimpwire.h index e0f49d05f2..1550a9b0a1 100644 --- a/libgimp/gimpwire.h +++ b/libgimp/gimpwire.h @@ -20,8 +20,11 @@ #ifndef __GIMP_WIRE_H__ #define __GIMP_WIRE_H__ +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ -#include +/* For information look into the C source or the html documentation */ typedef struct _WireMessage WireMessage; @@ -102,4 +105,9 @@ gboolean wire_write_string (GIOChannel *channel, gchar **data, gint count); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* __GIMP_WIRE_H__ */ diff --git a/libgimp/libgimp-intl.h b/libgimp/libgimp-intl.h index 0c67092fcf..ffc40c5b77 100644 --- a/libgimp/libgimp-intl.h +++ b/libgimp/libgimp-intl.h @@ -18,9 +18,11 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __LIBGIMP_INTL_H__ #define __LIBGIMP_INTL_H__ + #ifdef ENABLE_NLS # include # define _(String) dgettext ("gimp-libgimp", String) @@ -38,19 +40,5 @@ # define N_(String) (String) #endif + #endif /* __LIBGIMP_INTL_H__ */ - - - - - - - - - - - - - - - diff --git a/libgimp/stdplugins-intl.h b/libgimp/stdplugins-intl.h index 22c53a637c..023feab5df 100644 --- a/libgimp/stdplugins-intl.h +++ b/libgimp/stdplugins-intl.h @@ -18,11 +18,13 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __STDPLUGINS_INTL_H__ #define __STDPLUGINS_INTL_H__ #include "gimpintl.h" + #ifdef HAVE_LC_MESSAGES #define INIT_I18N() G_STMT_START{ \ setlocale(LC_MESSAGES, ""); \ @@ -44,4 +46,5 @@ INIT_I18N(); \ }G_STMT_END + #endif /* __STDPLUGINS_INTL_H__ */ diff --git a/libgimpbase/gimpenv.h b/libgimpbase/gimpenv.h index d40db14ab1..e1e6e91fde 100644 --- a/libgimpbase/gimpenv.h +++ b/libgimpbase/gimpenv.h @@ -30,6 +30,7 @@ extern "C" { /* For information look into the C source or the html documentation */ + gchar * gimp_directory (void); gchar * gimp_personal_rc_file (gchar *basename); gchar * gimp_data_directory (void); @@ -44,6 +45,7 @@ void gimp_path_free (GList *path); gchar * gimp_path_get_user_writable_dir (GList *path); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libgimpbase/gimplimits.h b/libgimpbase/gimplimits.h index f4c4d2201e..e7c19bc5b5 100644 --- a/libgimpbase/gimplimits.h +++ b/libgimpbase/gimplimits.h @@ -19,9 +19,11 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMP_LIMITS_H__ #define __GIMP_LIMITS_H__ + /* pixel sizes */ #define GIMP_MIN_IMAGE_SIZE 1 @@ -42,4 +44,5 @@ #define GIMP_CHECK_DARK 0.4 /* corresponds to GRAY_CHECKS as */ #define GIMP_CHECK_LIGHT 0.6 /* defined in app/image_render.c */ + #endif /* __GIMP_LIMITS_H__ */ diff --git a/libgimpbase/gimpparasite.h b/libgimpbase/gimpparasite.h index ccaf5c7aa0..f7f4d291e3 100644 --- a/libgimpbase/gimpparasite.h +++ b/libgimpbase/gimpparasite.h @@ -19,6 +19,7 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMP_PARASITE_H__ #define __GIMP_PARASITE_H__ @@ -26,6 +27,9 @@ extern "C" { #endif /* __cplusplus */ +/* For information look into the C source or the html documentation */ + + #define GIMP_PARASITE_PERSISTENT 1 #define GIMP_PARASITE_UNDOABLE 2 diff --git a/libgimpbase/gimpparasiteio.h b/libgimpbase/gimpparasiteio.h index a8771ab94a..469dcf35a4 100644 --- a/libgimpbase/gimpparasiteio.h +++ b/libgimpbase/gimpparasiteio.h @@ -19,6 +19,7 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMP_PARASITE_IO_H__ #define __GIMP_PARASITE_IO_H__ @@ -26,6 +27,9 @@ extern "C" { #endif /* __cplusplus */ +/* For information look into the C source or the html documentation */ + + /* Data structures for various standard parasites used by plug-ins and * the GIMP core, and functions to build and parse their string * representations. diff --git a/libgimpbase/gimpprotocol.h b/libgimpbase/gimpprotocol.h index 25802f7de7..4595d53919 100644 --- a/libgimpbase/gimpprotocol.h +++ b/libgimpbase/gimpprotocol.h @@ -16,10 +16,16 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMP_PROTOCOL_H__ #define __GIMP_PROTOCOL_H__ -#include +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/* For information look into the C source or the html documentation */ + /* Increment every time the protocol changes */ @@ -206,4 +212,8 @@ gboolean gp_extension_ack_write (GIOChannel *channel); gboolean gp_request_wakeups_write (GIOChannel *channel); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* __GIMP_PROTOCOL_H__ */ diff --git a/libgimpbase/gimpsignal.c b/libgimpbase/gimpsignal.c index e7f35b1bc7..f25e542ac0 100644 --- a/libgimpbase/gimpsignal.c +++ b/libgimpbase/gimpsignal.c @@ -19,6 +19,8 @@ * $Revision$ */ +#include + #include "gimpsignal.h" diff --git a/libgimpbase/gimpsignal.h b/libgimpbase/gimpsignal.h index e74b1e6c9c..5d4c1eb6f2 100644 --- a/libgimpbase/gimpsignal.h +++ b/libgimpbase/gimpsignal.h @@ -15,22 +15,26 @@ * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. - * - * $Revision$ */ + #ifndef __GIMP_SIGNAL_H__ #define __GIMP_SIGNAL_H__ +#include + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/* For information look into the C source or the html documentation */ + + /* A gimp-level interface to a Posix.1-compliant signal package lives here * For 1.2, this gimp-level interface mostly passes through to posix calls * without modification. Certain calls manipulate struct sigaction in * ways useful to Gimp. */ -#include - -#include - #ifdef __EMX__ /* hope this is right for OS/2 */ #define SA_RESTART SA_SYSV @@ -54,4 +58,9 @@ GimpSignalHandlerFunc gimp_signal_private (gint signum, */ #define gimp_signal_syscallrestart(signum,handler) gimp_signal_private ((signum), (handler), SA_RESTART) + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* __GIMP_SIGNAL_H__ */ diff --git a/libgimpbase/gimpunit.h b/libgimpbase/gimpunit.h index 0cc0d97eef..dbf9045672 100644 --- a/libgimpbase/gimpunit.h +++ b/libgimpbase/gimpunit.h @@ -30,12 +30,13 @@ #ifndef __GIMPUNIT_H__ #define __GIMPUNIT_H__ -#include - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ +/* For information look into the C source or the html documentation */ + + typedef enum { GIMP_UNIT_PIXEL = 0, @@ -50,7 +51,6 @@ typedef enum GIMP_UNIT_PERCENT = 65536 } GimpUnit; -/* For information look into the C source or the html documentation */ gint gimp_unit_get_number_of_units (void); gint gimp_unit_get_number_of_built_in_units (void); @@ -78,8 +78,9 @@ gchar * gimp_unit_get_abbreviation (GimpUnit unit); gchar * gimp_unit_get_singular (GimpUnit unit); gchar * gimp_unit_get_plural (GimpUnit unit); + #ifdef __cplusplus } #endif /* __cplusplus */ -#endif /* __GIMPUNIT_H__ */ +#endif /* __GIMPUNIT_H__ */ diff --git a/libgimpbase/gimputils.h b/libgimpbase/gimputils.h index 54b9f2ed1f..a0f0aad12c 100644 --- a/libgimpbase/gimputils.h +++ b/libgimpbase/gimputils.h @@ -28,14 +28,15 @@ extern "C" { #endif /* __cplusplus */ +/* For information look into the C source or the html documentation */ + + /* * Right now all you find here is the g_strescape function out of * glib-1.3. We need its functionality, but don't want to rely on * that version being installed */ -/* For information look into the C source or the html documentation */ - #if (defined (GLIB_CHECK_VERSION) && GLIB_CHECK_VERSION (1,3,1)) #define gimp_strescape(string, exceptions) g_strescape (string, exceptions) #else @@ -43,8 +44,9 @@ gchar* gimp_strescape (const gchar *source, const gchar *exceptions); #endif /* GLIB <= 1.3 */ + #ifdef __cplusplus } #endif /* __cplusplus */ -#endif /* __GIMPUTILS_H__ */ +#endif /* __GIMPUTILS_H__ */ diff --git a/libgimpbase/gimpwire.c b/libgimpbase/gimpwire.c index c6958923d2..785ad29f65 100644 --- a/libgimpbase/gimpwire.c +++ b/libgimpbase/gimpwire.c @@ -36,6 +36,8 @@ #include #endif +#include + #include "gimpwire.h" diff --git a/libgimpbase/gimpwire.h b/libgimpbase/gimpwire.h index e0f49d05f2..1550a9b0a1 100644 --- a/libgimpbase/gimpwire.h +++ b/libgimpbase/gimpwire.h @@ -20,8 +20,11 @@ #ifndef __GIMP_WIRE_H__ #define __GIMP_WIRE_H__ +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ -#include +/* For information look into the C source or the html documentation */ typedef struct _WireMessage WireMessage; @@ -102,4 +105,9 @@ gboolean wire_write_string (GIOChannel *channel, gchar **data, gint count); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* __GIMP_WIRE_H__ */ diff --git a/libgimpwidgets/gimpchainbutton.c b/libgimpwidgets/gimpchainbutton.c index 2f4650e95a..7e48889057 100644 --- a/libgimpwidgets/gimpchainbutton.c +++ b/libgimpwidgets/gimpchainbutton.c @@ -20,7 +20,10 @@ * Boston, MA 02111-1307, USA. */ +#include + #include "gimpchainbutton.h" + #include "pixmaps/chain.xpm" static gchar **gimp_chain_xpm[] = diff --git a/libgimpwidgets/gimpchainbutton.h b/libgimpwidgets/gimpchainbutton.h index 004a265912..8942471140 100644 --- a/libgimpwidgets/gimpchainbutton.h +++ b/libgimpwidgets/gimpchainbutton.h @@ -31,10 +31,6 @@ #ifndef __GIMP_CHAIN_BUTTON_H__ #define __GIMP_CHAIN_BUTTON_H__ - -#include - - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -80,16 +76,15 @@ struct _GimpChainButtonClass }; -GtkType gimp_chain_button_get_type (void); -GtkWidget* gimp_chain_button_new (GimpChainPosition position); -void gimp_chain_button_set_active (GimpChainButton *gcb, - gboolean is_active); -gboolean gimp_chain_button_get_active (GimpChainButton *gcb); +GtkType gimp_chain_button_get_type (void); +GtkWidget * gimp_chain_button_new (GimpChainPosition position); +void gimp_chain_button_set_active (GimpChainButton *gcb, + gboolean is_active); +gboolean gimp_chain_button_get_active (GimpChainButton *gcb); #ifdef __cplusplus } #endif /* __cplusplus */ - #endif /* __CHAIN_BUTTON_H__ */ diff --git a/libgimpwidgets/gimpcolorbutton.c b/libgimpwidgets/gimpcolorbutton.c index 06bb1b46f2..65d00ccdd2 100644 --- a/libgimpwidgets/gimpcolorbutton.c +++ b/libgimpwidgets/gimpcolorbutton.c @@ -30,6 +30,8 @@ #include "config.h" +#include + #include "gimp.h" #include "gimpcolorbutton.h" #include "gimplimits.h" diff --git a/libgimpwidgets/gimpcolorbutton.h b/libgimpwidgets/gimpcolorbutton.h index 6c925b56d4..124cbf954b 100644 --- a/libgimpwidgets/gimpcolorbutton.h +++ b/libgimpwidgets/gimpcolorbutton.h @@ -29,8 +29,6 @@ #ifndef __GIMP_COLOR_BUTTON_H__ #define __GIMP_COLOR_BUTTON_H__ -#include - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -53,22 +51,22 @@ struct _GimpColorButtonClass }; -GtkType gimp_color_button_get_type (void); -GtkWidget* gimp_color_button_new (gchar *title, - gint width, - gint height, - guchar *color, - gint bpp); -GtkWidget* gimp_color_button_double_new (gchar *title, - gint width, - gint height, - gdouble *color, - gint bpp); -void gimp_color_button_update (GimpColorButton *gcb); +GtkType gimp_color_button_get_type (void); +GtkWidget * gimp_color_button_new (gchar *title, + gint width, + gint height, + guchar *color, + gint bpp); +GtkWidget * gimp_color_button_double_new (gchar *title, + gint width, + gint height, + gdouble *color, + gint bpp); +void gimp_color_button_update (GimpColorButton *gcb); + #ifdef __cplusplus } #endif /* __cplusplus */ - #endif /* __COLOR_BUTTON_H__ */ diff --git a/libgimpwidgets/gimpdialog.c b/libgimpwidgets/gimpdialog.c index a39a094005..c76d897680 100644 --- a/libgimpwidgets/gimpdialog.c +++ b/libgimpwidgets/gimpdialog.c @@ -19,7 +19,10 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ -#include "libgimp/gimpdialog.h" + +#include + +#include "gimpdialog.h" #include "pixmaps/wilber.xpm" diff --git a/libgimpwidgets/gimpdialog.h b/libgimpwidgets/gimpdialog.h index f8297caa5a..003d81601b 100644 --- a/libgimpwidgets/gimpdialog.h +++ b/libgimpwidgets/gimpdialog.h @@ -19,18 +19,19 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMP_DIALOG_H__ #define __GIMP_DIALOG_H__ -#include - -#include "gimphelpui.h" -#include "gimpunit.h" +#include #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ +/* For information look into the C source or the html documentation */ + + GtkWidget * gimp_dialog_new (const gchar *title, const gchar *wmclass_name, GimpHelpFunc help_func, @@ -83,24 +84,9 @@ void gimp_dialog_create_action_area (GtkDialog *dialog, void gimp_dialog_create_action_areav (GtkDialog *dialog, va_list args); + #ifdef __cplusplus } #endif /* __cplusplus */ #endif /* __GIMP_DIALOG_H__ */ - - - - - - - - - - - - - - - - diff --git a/libgimpwidgets/gimpfileentry.c b/libgimpwidgets/gimpfileentry.c index 1215f1fa9e..a118965654 100644 --- a/libgimpwidgets/gimpfileentry.c +++ b/libgimpwidgets/gimpfileentry.c @@ -30,6 +30,8 @@ #endif #include +#include + #include "gimpfileselection.h" #include "libgimp-intl.h" @@ -37,6 +39,7 @@ #include "pixmaps/yes.xpm" #include "pixmaps/no.xpm" + #ifdef G_OS_WIN32 # ifndef S_ISDIR # define S_ISDIR(m) ((m) & _S_IFDIR) diff --git a/libgimpwidgets/gimpfileentry.h b/libgimpwidgets/gimpfileentry.h index 628564067c..3f1806ebf4 100644 --- a/libgimpwidgets/gimpfileentry.h +++ b/libgimpwidgets/gimpfileentry.h @@ -23,12 +23,13 @@ #ifndef __GIMP_FILE_SELECTION_H__ #define __GIMP_FILE_SELECTION_H__ -#include - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ +/* For information look into the C source or the html documentation */ + + #define GIMP_TYPE_FILE_SELECTION (gimp_file_selection_get_type ()) #define GIMP_FILE_SELECTION(obj) (GTK_CHECK_CAST ((obj), GIMP_TYPE_FILE_SELECTION, GimpFileSelection)) #define GIMP_FILE_SELECTION_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FILE_SELECTION, GimpFileSelectionClass)) @@ -79,6 +80,7 @@ gchar* gimp_file_selection_get_filename (GimpFileSelection *gfs); void gimp_file_selection_set_filename (GimpFileSelection *gfs, gchar *filename); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libgimpwidgets/gimpfileselection.c b/libgimpwidgets/gimpfileselection.c index 1215f1fa9e..a118965654 100644 --- a/libgimpwidgets/gimpfileselection.c +++ b/libgimpwidgets/gimpfileselection.c @@ -30,6 +30,8 @@ #endif #include +#include + #include "gimpfileselection.h" #include "libgimp-intl.h" @@ -37,6 +39,7 @@ #include "pixmaps/yes.xpm" #include "pixmaps/no.xpm" + #ifdef G_OS_WIN32 # ifndef S_ISDIR # define S_ISDIR(m) ((m) & _S_IFDIR) diff --git a/libgimpwidgets/gimpfileselection.h b/libgimpwidgets/gimpfileselection.h index 628564067c..3f1806ebf4 100644 --- a/libgimpwidgets/gimpfileselection.h +++ b/libgimpwidgets/gimpfileselection.h @@ -23,12 +23,13 @@ #ifndef __GIMP_FILE_SELECTION_H__ #define __GIMP_FILE_SELECTION_H__ -#include - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ +/* For information look into the C source or the html documentation */ + + #define GIMP_TYPE_FILE_SELECTION (gimp_file_selection_get_type ()) #define GIMP_FILE_SELECTION(obj) (GTK_CHECK_CAST ((obj), GIMP_TYPE_FILE_SELECTION, GimpFileSelection)) #define GIMP_FILE_SELECTION_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FILE_SELECTION, GimpFileSelectionClass)) @@ -79,6 +80,7 @@ gchar* gimp_file_selection_get_filename (GimpFileSelection *gfs); void gimp_file_selection_set_filename (GimpFileSelection *gfs, gchar *filename); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libgimpwidgets/gimphelpui.c b/libgimpwidgets/gimphelpui.c index 1dfa20aa8e..17913137d2 100644 --- a/libgimpwidgets/gimphelpui.c +++ b/libgimpwidgets/gimphelpui.c @@ -19,6 +19,7 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #include #include diff --git a/libgimpwidgets/gimphelpui.h b/libgimpwidgets/gimphelpui.h index c2501399d8..2f4e295d0b 100644 --- a/libgimpwidgets/gimphelpui.h +++ b/libgimpwidgets/gimphelpui.h @@ -19,15 +19,17 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMP_HELP_UI_H__ #define __GIMP_HELP_UI_H__ -#include - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ +/* For information look into the C source or the html documentation */ + + typedef void (* GimpHelpFunc) (gchar *help_data); void gimp_help_init (void); @@ -54,13 +56,9 @@ void gimp_help_set_help_data (GtkWidget *widget, /* activate the context help inspector */ void gimp_context_help (void); + #ifdef __cplusplus } #endif /* __cplusplus */ #endif /* __GIMP_HELP_UI_H__ */ - - - - - diff --git a/libgimpwidgets/gimppatheditor.c b/libgimpwidgets/gimppatheditor.c index ce4902760b..1c95808c4a 100644 --- a/libgimpwidgets/gimppatheditor.c +++ b/libgimpwidgets/gimppatheditor.c @@ -19,8 +19,11 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #include +#include + #include "gimppatheditor.h" #include "libgimp/gimpfileselection.h" @@ -31,6 +34,7 @@ #include "pixmaps/raise.xpm" #include "pixmaps/lower.xpm" + /* forward declaration */ static void gimp_path_editor_select_callback (GtkWidget *widget, gpointer data); diff --git a/libgimpwidgets/gimppatheditor.h b/libgimpwidgets/gimppatheditor.h index 304b5bd5d6..dcdedb6463 100644 --- a/libgimpwidgets/gimppatheditor.h +++ b/libgimpwidgets/gimppatheditor.h @@ -19,15 +19,17 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMP_PATH_EDITOR_H__ #define __GIMP_PATH_EDITOR_H__ -#include - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ +/* For information look into the C source or the html documentation */ + + #define GIMP_TYPE_PATH_EDITOR (gimp_path_editor_get_type ()) #define GIMP_PATH_EDITOR(obj) (GTK_CHECK_CAST ((obj), GIMP_TYPE_PATH_EDITOR, GimpPathEditor)) #define GIMP_PATH_EDITOR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PATH_EDITOR, GimpPathEditorClass)) @@ -72,6 +74,7 @@ GtkWidget * gimp_path_editor_new (gchar *filesel_title, gchar * gimp_path_editor_get_path (GimpPathEditor *gpe); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libgimpwidgets/gimppixmap.c b/libgimpwidgets/gimppixmap.c index 8296a5e09f..85649a05e4 100644 --- a/libgimpwidgets/gimppixmap.c +++ b/libgimpwidgets/gimppixmap.c @@ -22,8 +22,11 @@ #include +#include + #include "gimppixmap.h" + struct _GimpPixmap { GtkPixmap pixmap; diff --git a/libgimpwidgets/gimppixmap.h b/libgimpwidgets/gimppixmap.h index eec51604bb..d5c7ef5d87 100644 --- a/libgimpwidgets/gimppixmap.h +++ b/libgimpwidgets/gimppixmap.h @@ -19,15 +19,17 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMP_PIXMAP_H__ #define __GIMP_PIXMAP_H__ -#include - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ +/* For information look into the C source or the html documentation */ + + #define GIMP_TYPE_PIXMAP (gimp_pixmap_get_type ()) #define GIMP_PIXMAP(obj) (GTK_CHECK_CAST ((obj), GIMP_TYPE_PIXMAP, GimpPixmap)) #define GIMP_PIXMAP_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PIXMAP, GimpPixmapClass)) @@ -48,8 +50,9 @@ GtkWidget * gimp_pixmap_new (gchar **xpm_data); void gimp_pixmap_set (GimpPixmap *pixmap, gchar **xpm_data); + #ifdef __cplusplus } #endif /* __cplusplus */ -#endif /* __GIMP_PIXMAP_H__ */ +#endif /* __GIMP_PIXMAP_H__ */ diff --git a/libgimpwidgets/gimpquerybox.c b/libgimpwidgets/gimpquerybox.c index 5dc1656a2e..06e2db30bb 100644 --- a/libgimpwidgets/gimpquerybox.c +++ b/libgimpwidgets/gimpquerybox.c @@ -20,18 +20,21 @@ * Boston, MA 02111-1307, USA. */ -#include "gimpquerybox.h" +#include "config.h" + +#include #include "gimpdialog.h" #include "gimppixmap.h" +#include "gimpquerybox.h" #include "gimpsizeentry.h" #include "gimpwidgets.h" -#include "config.h" #include "libgimp-intl.h" #include "pixmaps/eek.xpm" + /* * String, integer, double and size query boxes */ diff --git a/libgimpwidgets/gimpquerybox.h b/libgimpwidgets/gimpquerybox.h index cba746350f..0ffe60b128 100644 --- a/libgimpwidgets/gimpquerybox.h +++ b/libgimpwidgets/gimpquerybox.h @@ -19,14 +19,18 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMP_QUERY_BOX_H__ #define __GIMP_QUERY_BOX_H__ -#include +#include -#include "gimphelpui.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/* For information look into the C source or the html documentation */ -#include "gimpunit.h" /* query box callback prototypes */ typedef void (* GimpQueryStringCallback) (GtkWidget *query_box, @@ -114,4 +118,9 @@ GtkWidget * gimp_query_boolean_box (gchar *title, GimpQueryBooleanCallback callback, gpointer data); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* __GIMP_QUERY_BOX_H__ */ diff --git a/libgimpwidgets/gimpsizeentry.c b/libgimpwidgets/gimpsizeentry.c index 3cdebc946f..2253022e54 100644 --- a/libgimpwidgets/gimpsizeentry.c +++ b/libgimpwidgets/gimpsizeentry.c @@ -21,10 +21,13 @@ * Boston, MA 02111-1307, USA. */ +#include + #include "gimplimits.h" #include "gimpsizeentry.h" #include "gimpunitmenu.h" + #define SIZE_MAX_VALUE 500000.0 static void gimp_size_entry_unit_callback (GtkWidget *widget, diff --git a/libgimpwidgets/gimpsizeentry.h b/libgimpwidgets/gimpsizeentry.h index bbf86c4972..d3b5935c12 100644 --- a/libgimpwidgets/gimpsizeentry.h +++ b/libgimpwidgets/gimpsizeentry.h @@ -20,17 +20,19 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMP_SIZE_ENTRY_H__ #define __GIMP_SIZE_ENTRY_H__ -#include - -#include "gimpunit.h" +#include #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ +/* For information look into the C source or the html documentation */ + + #define GIMP_TYPE_SIZE_ENTRY (gimp_size_entry_get_type ()) #define GIMP_SIZE_ENTRY(obj) (GTK_CHECK_CAST ((obj), GIMP_TYPE_SIZE_ENTRY, GimpSizeEntry)) #define GIMP_SIZE_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SIZE_ENTRY, GimpSizeEntryClass)) @@ -138,6 +140,7 @@ void gimp_size_entry_set_unit (GimpSizeEntry *gse, void gimp_size_entry_grab_focus (GimpSizeEntry *gse); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libgimpwidgets/gimpunitmenu.c b/libgimpwidgets/gimpunitmenu.c index 5d6e267586..b61ee26b3b 100644 --- a/libgimpwidgets/gimpunitmenu.c +++ b/libgimpwidgets/gimpunitmenu.c @@ -19,13 +19,17 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #include "config.h" +#include + #include "gimpdialog.h" #include "gimpunitmenu.h" #include "libgimp-intl.h" + /* private functions */ static const gchar * gimp_unit_menu_build_string (gchar *format, GimpUnit unit); diff --git a/libgimpwidgets/gimpunitmenu.h b/libgimpwidgets/gimpunitmenu.h index 3875c82e83..1b688bbad1 100644 --- a/libgimpwidgets/gimpunitmenu.h +++ b/libgimpwidgets/gimpunitmenu.h @@ -19,17 +19,19 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMP_UNIT_MENU_H__ #define __GIMP_UNIT_MENU_H__ -#include - -#include "gimpunit.h" +#include #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ +/* For information look into the C source or the html documentation */ + + #define GIMP_TYPE_UNIT_MENU (gimp_unit_menu_get_type ()) #define GIMP_UNIT_MENU(obj) (GTK_CHECK_CAST ((obj), GIMP_TYPE_UNIT_MENU, GimpUnitMenu)) #define GIMP_UNIT_MENU_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_UNIT_MENU, GimpUnitMenuClass)) @@ -62,7 +64,6 @@ struct _GimpUnitMenuClass void (* unit_changed) (GimpUnitMenu *gum); }; -/* For information look into the C source or the html documentation */ GtkType gimp_unit_menu_get_type (void); @@ -77,6 +78,7 @@ void gimp_unit_menu_set_unit (GimpUnitMenu *gum, GimpUnit gimp_unit_menu_get_unit (GimpUnitMenu *gum); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libgimpwidgets/gimpwidgets.c b/libgimpwidgets/gimpwidgets.c index 887baff4af..5a39c6ac50 100644 --- a/libgimpwidgets/gimpwidgets.c +++ b/libgimpwidgets/gimpwidgets.c @@ -22,6 +22,8 @@ #include "config.h" +#include + #include "gimpchainbutton.h" #include "gimphelpui.h" #include "gimppixmap.h" @@ -31,6 +33,7 @@ #include "libgimp-intl.h" + /* * Widget Constructors */ diff --git a/libgimpwidgets/gimpwidgets.h b/libgimpwidgets/gimpwidgets.h index 2ad312dbd6..8e818637a4 100644 --- a/libgimpwidgets/gimpwidgets.h +++ b/libgimpwidgets/gimpwidgets.h @@ -19,16 +19,15 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GIMP_WIDGETS_H__ #define __GIMP_WIDGETS_H__ -#include - -#include "gimpsizeentry.h" +#include #ifdef __cplusplus extern "C" { -#endif +#endif /* __cplusplus */ /* For information look into the C source or the html documentation */ @@ -244,8 +243,9 @@ void gimp_table_attach_aligned (GtkTable *table, gint colspan, gboolean left_align); + #ifdef __cplusplus } -#endif +#endif /* __cplusplus */ #endif /* __GIMP_WIDGETS_H__ */