diff --git a/libgimpwidgets/gimpbrowser.h b/libgimpwidgets/gimpbrowser.h index 3ebc17b86f..dc6fe0b2a2 100644 --- a/libgimpwidgets/gimpbrowser.h +++ b/libgimpwidgets/gimpbrowser.h @@ -19,22 +19,20 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_BROWSER_H__ +#define __GIMP_BROWSER_H__ + G_BEGIN_DECLS /* For information look into the C source or the html documentation */ #define GIMP_TYPE_BROWSER (gimp_browser_get_type ()) -G_DECLARE_FINAL_TYPE (GimpBrowser, - gimp_browser, - GIMP, BROWSER, - GtkPaned) +G_DECLARE_FINAL_TYPE (GimpBrowser, gimp_browser, GIMP, BROWSER, GtkPaned) GtkWidget * gimp_browser_new (void); @@ -54,4 +52,7 @@ void gimp_browser_set_widget (GimpBrowser *browser, void gimp_browser_show_message (GimpBrowser *browser, const gchar *message); + G_END_DECLS + +#endif /* __GIMP_BROWSER_H__ */ diff --git a/libgimpwidgets/gimpbusybox.h b/libgimpwidgets/gimpbusybox.h index 53dbddaea0..814f360372 100644 --- a/libgimpwidgets/gimpbusybox.h +++ b/libgimpwidgets/gimpbusybox.h @@ -19,19 +19,17 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_BUSY_BOX_H__ +#define __GIMP_BUSY_BOX_H__ + G_BEGIN_DECLS #define GIMP_TYPE_BUSY_BOX (gimp_busy_box_get_type ()) -G_DECLARE_FINAL_TYPE (GimpBusyBox, - gimp_busy_box, - GIMP, BUSY_BOX, - GtkBox) +G_DECLARE_FINAL_TYPE (GimpBusyBox, gimp_busy_box, GIMP, BUSY_BOX, GtkBox) GtkWidget * gimp_busy_box_new (const gchar *message); @@ -40,4 +38,7 @@ void gimp_busy_box_set_message (GimpBusyBox *box, const gchar *message); const gchar * gimp_busy_box_get_message (GimpBusyBox *box); + G_END_DECLS + +#endif /* __GIMP_BUSY_BOX_H__ */ diff --git a/libgimpwidgets/gimpbutton.h b/libgimpwidgets/gimpbutton.h index bb685bfe5c..7d8fd21f7f 100644 --- a/libgimpwidgets/gimpbutton.h +++ b/libgimpwidgets/gimpbutton.h @@ -19,23 +19,20 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_BUTTON_H__ +#define __GIMP_BUTTON_H__ + G_BEGIN_DECLS /* For information look into the C source or the html documentation */ #define GIMP_TYPE_BUTTON (gimp_button_get_type ()) -G_DECLARE_DERIVABLE_TYPE (GimpButton, - gimp_button, - GIMP, BUTTON, - GtkButton) - +G_DECLARE_DERIVABLE_TYPE (GimpButton, gimp_button, GIMP, BUTTON, GtkButton) struct _GimpButtonClass { @@ -63,4 +60,7 @@ GtkWidget * gimp_button_new (void); void gimp_button_extended_clicked (GimpButton *button, GdkModifierType modifier_state); + G_END_DECLS + +#endif /* __GIMP_BUTTON_H__ */ diff --git a/libgimpwidgets/gimpcairo-utils.h b/libgimpwidgets/gimpcairo-utils.h index 489672f072..0010b01baa 100644 --- a/libgimpwidgets/gimpcairo-utils.h +++ b/libgimpwidgets/gimpcairo-utils.h @@ -19,12 +19,13 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_CAIRO_UTILS_H__ +#define __GIMP_CAIRO_UTILS_H__ + gboolean gimp_cairo_set_focus_line_pattern (cairo_t *cr, GtkWidget *widget); @@ -36,3 +37,6 @@ void gimp_cairo_set_source_color (cairo_t *cr, GimpColorConfig *config, gboolean softproof, GtkWidget *widget); + + +#endif /* __GIMP_CAIRO_UTILS_H__ */ diff --git a/libgimpwidgets/gimpcellrenderercolor.h b/libgimpwidgets/gimpcellrenderercolor.h index 5cfca00e62..46b44d92e8 100644 --- a/libgimpwidgets/gimpcellrenderercolor.h +++ b/libgimpwidgets/gimpcellrenderercolor.h @@ -2,7 +2,7 @@ * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimpcellrenderercolor.h - * Copyright (C) 2004 Sven Neuman + * Copyright (C) 2004 Sven Neuman * * This library is free software: you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,21 +19,23 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_CELL_RENDERER_COLOR_H__ +#define __GIMP_CELL_RENDERER_COLOR_H__ + G_BEGIN_DECLS + #define GIMP_TYPE_CELL_RENDERER_COLOR (gimp_cell_renderer_color_get_type ()) -G_DECLARE_FINAL_TYPE (GimpCellRendererColor, - gimp_cell_renderer_color, - GIMP, CELL_RENDERER_COLOR, - GtkCellRenderer) +G_DECLARE_FINAL_TYPE (GimpCellRendererColor, gimp_cell_renderer_color, GIMP, CELL_RENDERER_COLOR, GtkCellRenderer) -GtkCellRenderer * gimp_cell_renderer_color_new (void); +GtkCellRenderer * gimp_cell_renderer_color_new (void); + G_END_DECLS + +#endif /* __GIMP_CELL_RENDERER_COLOR_H__ */ diff --git a/libgimpwidgets/gimpcellrenderertoggle.h b/libgimpwidgets/gimpcellrenderertoggle.h index 1757df9638..144f842008 100644 --- a/libgimpwidgets/gimpcellrenderertoggle.h +++ b/libgimpwidgets/gimpcellrenderertoggle.h @@ -19,19 +19,18 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_CELL_RENDERER_TOGGLE_H__ +#define __GIMP_CELL_RENDERER_TOGGLE_H__ + G_BEGIN_DECLS + #define GIMP_TYPE_CELL_RENDERER_TOGGLE (gimp_cell_renderer_toggle_get_type ()) -G_DECLARE_FINAL_TYPE (GimpCellRendererToggle, - gimp_cell_renderer_toggle, - GIMP, CELL_RENDERER_TOGGLE, - GtkCellRendererToggle) +G_DECLARE_FINAL_TYPE (GimpCellRendererToggle, gimp_cell_renderer_toggle, GIMP, CELL_RENDERER_TOGGLE, GtkCellRendererToggle) GtkCellRenderer * gimp_cell_renderer_toggle_new (const gchar *icon_name); @@ -40,4 +39,7 @@ void gimp_cell_renderer_toggle_clicked (GimpCellRendererToggle *cel const gchar *path, GdkModifierType state); + G_END_DECLS + +#endif /* __GIMP_CELL_RENDERER_TOGGLE_H__ */ diff --git a/libgimpwidgets/gimpchainbutton.h b/libgimpwidgets/gimpchainbutton.h index 4780a70abf..da43d6dfb4 100644 --- a/libgimpwidgets/gimpchainbutton.h +++ b/libgimpwidgets/gimpchainbutton.h @@ -27,19 +27,18 @@ * provides. */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_CHAIN_BUTTON_H__ +#define __GIMP_CHAIN_BUTTON_H__ + G_BEGIN_DECLS + #define GIMP_TYPE_CHAIN_BUTTON (gimp_chain_button_get_type ()) -G_DECLARE_FINAL_TYPE (GimpChainButton, - gimp_chain_button, - GIMP, CHAIN_BUTTON, - GtkGrid) +G_DECLARE_FINAL_TYPE (GimpChainButton, gimp_chain_button, GIMP, CHAIN_BUTTON, GtkGrid) GtkWidget * gimp_chain_button_new (GimpChainPosition position); @@ -54,4 +53,7 @@ gboolean gimp_chain_button_get_active (GimpChainButton *button); GtkWidget * gimp_chain_button_get_button (GimpChainButton *button); + G_END_DECLS + +#endif /* __GIMP_CHAIN_BUTTON_H__ */ diff --git a/libgimpwidgets/gimpcolorarea.h b/libgimpwidgets/gimpcolorarea.h index 0400602bd6..6a58535c70 100644 --- a/libgimpwidgets/gimpcolorarea.h +++ b/libgimpwidgets/gimpcolorarea.h @@ -24,19 +24,18 @@ * handles drag'n'drop. */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_COLOR_AREA_H__ +#define __GIMP_COLOR_AREA_H__ + G_BEGIN_DECLS + #define GIMP_TYPE_COLOR_AREA (gimp_color_area_get_type ()) -G_DECLARE_FINAL_TYPE (GimpColorArea, - gimp_color_area, - GIMP, COLOR_AREA, - GtkDrawingArea) +G_DECLARE_FINAL_TYPE (GimpColorArea, gimp_color_area, GIMP, COLOR_AREA, GtkDrawingArea) GtkWidget * gimp_color_area_new (GeglColor *color, @@ -60,4 +59,7 @@ void gimp_color_area_set_out_of_gamut (GimpColorArea *area, void gimp_color_area_set_color_config (GimpColorArea *area, GimpColorConfig *config); + G_END_DECLS + +#endif /* __GIMP_COLOR_AREA_H__ */ diff --git a/libgimpwidgets/gimpcolorbutton.h b/libgimpwidgets/gimpcolorbutton.h index fb5fa2a8e2..af0c4b11f0 100644 --- a/libgimpwidgets/gimpcolorbutton.h +++ b/libgimpwidgets/gimpcolorbutton.h @@ -25,22 +25,20 @@ * fully functional wired to the preview button. */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_COLOR_BUTTON_H__ +#define __GIMP_COLOR_BUTTON_H__ + #include G_BEGIN_DECLS -#define GIMP_TYPE_COLOR_BUTTON (gimp_color_button_get_type ()) -G_DECLARE_DERIVABLE_TYPE (GimpColorButton, - gimp_color_button, - GIMP, COLOR_BUTTON, - GimpButton) +#define GIMP_TYPE_COLOR_BUTTON (gimp_color_button_get_type ()) +G_DECLARE_DERIVABLE_TYPE (GimpColorButton, gimp_color_button, GIMP, COLOR_BUTTON, GimpButton) struct _GimpColorButtonClass { @@ -91,7 +89,9 @@ void gimp_color_button_set_update (GimpColorButton *button, void gimp_color_button_set_color_config (GimpColorButton *button, GimpColorConfig *config); -GSimpleActionGroup * - gimp_color_button_get_action_group (GimpColorButton *button); +GSimpleActionGroup * gimp_color_button_get_action_group (GimpColorButton *button); + G_END_DECLS + +#endif /* __GIMP_COLOR_BUTTON_H__ */ diff --git a/libgimpwidgets/gimpcolordisplay.h b/libgimpwidgets/gimpcolordisplay.h index 26cb6f0b77..1923e2ad0b 100644 --- a/libgimpwidgets/gimpcolordisplay.h +++ b/libgimpwidgets/gimpcolordisplay.h @@ -19,22 +19,20 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_COLOR_DISPLAY_H__ +#define __GIMP_COLOR_DISPLAY_H__ + G_BEGIN_DECLS /* For information look at the html documentation */ #define GIMP_TYPE_COLOR_DISPLAY (gimp_color_display_get_type ()) -G_DECLARE_DERIVABLE_TYPE (GimpColorDisplay, - gimp_color_display, - GIMP, COLOR_DISPLAY, - GObject) +G_DECLARE_DERIVABLE_TYPE (GimpColorDisplay, gimp_color_display, GIMP, COLOR_DISPLAY, GObject) struct _GimpColorDisplayClass @@ -88,4 +86,7 @@ gboolean gimp_color_display_get_enabled (GimpColorDisplay *display GimpColorConfig * gimp_color_display_get_config (GimpColorDisplay *display); GimpColorManaged * gimp_color_display_get_managed (GimpColorDisplay *display); + G_END_DECLS + +#endif /* __GIMP_COLOR_DISPLAY_H__ */ diff --git a/libgimpwidgets/gimpcolordisplaystack.h b/libgimpwidgets/gimpcolordisplaystack.h index bd1b8350d8..949977f1d3 100644 --- a/libgimpwidgets/gimpcolordisplaystack.h +++ b/libgimpwidgets/gimpcolordisplaystack.h @@ -19,26 +19,24 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_COLOR_DISPLAY_STACK_H__ +#define __GIMP_COLOR_DISPLAY_STACK_H__ + G_BEGIN_DECLS /* For information look at the html documentation */ #define GIMP_TYPE_COLOR_DISPLAY_STACK (gimp_color_display_stack_get_type ()) -G_DECLARE_FINAL_TYPE (GimpColorDisplayStack, - gimp_color_display_stack, - GIMP, COLOR_DISPLAY_STACK, - GObject) +G_DECLARE_FINAL_TYPE (GimpColorDisplayStack, gimp_color_display_stack, GIMP, COLOR_DISPLAY_STACK, GObject) -GimpColorDisplayStack * gimp_color_display_stack_new (void); -GimpColorDisplayStack * gimp_color_display_stack_clone (GimpColorDisplayStack *stack); +GimpColorDisplayStack * gimp_color_display_stack_new (void); +GimpColorDisplayStack * gimp_color_display_stack_clone (GimpColorDisplayStack *stack); void gimp_color_display_stack_changed (GimpColorDisplayStack *stack); @@ -56,4 +54,7 @@ void gimp_color_display_stack_convert_buffer (GimpColorDisplayStack *stack, GeglBuffer *buffer, GeglRectangle *area); + G_END_DECLS + +#endif /* __GIMP_COLOR_DISPLAY_STACK_H__ */ diff --git a/libgimpwidgets/gimpcolorhexentry.h b/libgimpwidgets/gimpcolorhexentry.h index d3e21c22e8..39f4c11b97 100644 --- a/libgimpwidgets/gimpcolorhexentry.h +++ b/libgimpwidgets/gimpcolorhexentry.h @@ -19,19 +19,18 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_COLOR_HEX_ENTRY_H__ +#define __GIMP_COLOR_HEX_ENTRY_H__ + G_BEGIN_DECLS + #define GIMP_TYPE_COLOR_HEX_ENTRY (gimp_color_hex_entry_get_type ()) -G_DECLARE_FINAL_TYPE (GimpColorHexEntry, - gimp_color_hex_entry, - GIMP, COLOR_HEX_ENTRY, - GtkEntry) +G_DECLARE_FINAL_TYPE (GimpColorHexEntry, gimp_color_hex_entry, GIMP, COLOR_HEX_ENTRY, GtkEntry) GtkWidget * gimp_color_hex_entry_new (void); @@ -40,4 +39,7 @@ void gimp_color_hex_entry_set_color (GimpColorHexEntry *entry, GeglColor *color); GeglColor * gimp_color_hex_entry_get_color (GimpColorHexEntry *entry); + G_END_DECLS + +#endif /* __GIMP_COLOR_HEX_ENTRY_H__ */ diff --git a/libgimpwidgets/gimpcolornotebook.h b/libgimpwidgets/gimpcolornotebook.h index f98e8015cb..bba3e36db6 100644 --- a/libgimpwidgets/gimpcolornotebook.h +++ b/libgimpwidgets/gimpcolornotebook.h @@ -22,21 +22,20 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_COLOR_NOTEBOOK_H__ +#define __GIMP_COLOR_NOTEBOOK_H__ + #include G_BEGIN_DECLS + #define GIMP_TYPE_COLOR_NOTEBOOK (gimp_color_notebook_get_type ()) -G_DECLARE_FINAL_TYPE (GimpColorNotebook, - gimp_color_notebook, - GIMP, COLOR_NOTEBOOK, - GimpColorSelector) +G_DECLARE_FINAL_TYPE (GimpColorNotebook, gimp_color_notebook, GIMP, COLOR_NOTEBOOK, GimpColorSelector) GtkWidget * gimp_color_notebook_set_has_page (GimpColorNotebook *notebook, @@ -55,4 +54,7 @@ void gimp_color_notebook_set_simulation (GimpColorNotebook void gimp_color_notebook_enable_simulation (GimpColorNotebook *notebook, gboolean enabled); + G_END_DECLS + +#endif /* __GIMP_COLOR_NOTEBOOK_H__ */ diff --git a/libgimpwidgets/gimpcolorprofilechooserdialog.h b/libgimpwidgets/gimpcolorprofilechooserdialog.h index 4a8048ba03..9cb4e6437f 100644 --- a/libgimpwidgets/gimpcolorprofilechooserdialog.h +++ b/libgimpwidgets/gimpcolorprofilechooserdialog.h @@ -19,19 +19,20 @@ * along with this program. If not, see . */ -#pragma once +#ifndef __GIMP_COLOR_PROFILE_CHOOSER_DIALOG_H__ +#define __GIMP_COLOR_PROFILE_CHOOSER_DIALOG_H__ G_BEGIN_DECLS + #define GIMP_TYPE_COLOR_PROFILE_CHOOSER_DIALOG (gimp_color_profile_chooser_dialog_get_type ()) -G_DECLARE_FINAL_TYPE (GimpColorProfileChooserDialog, - gimp_color_profile_chooser_dialog, - GIMP, COLOR_PROFILE_CHOOSER_DIALOG, - GtkFileChooserDialog) +G_DECLARE_FINAL_TYPE (GimpColorProfileChooserDialog, gimp_color_profile_chooser_dialog, GIMP, COLOR_PROFILE_CHOOSER_DIALOG, GtkFileChooserDialog) +GtkWidget * gimp_color_profile_chooser_dialog_new (const gchar *title, + GtkWindow *parent, + GtkFileChooserAction action); -GtkWidget * gimp_color_profile_chooser_dialog_new (const gchar *title, - GtkWindow *parent, - GtkFileChooserAction action); G_END_DECLS + +#endif /* __GIMP_COLOR_PROFILE_CHOOSER_DIALOG_H__ */ diff --git a/libgimpwidgets/gimpcolorprofilecombobox.h b/libgimpwidgets/gimpcolorprofilecombobox.h index 7d0e08ab6d..dbc1c1e0a5 100644 --- a/libgimpwidgets/gimpcolorprofilecombobox.h +++ b/libgimpwidgets/gimpcolorprofilecombobox.h @@ -19,19 +19,17 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_COLOR_PROFILE_COMBO_BOX_H__ +#define __GIMP_COLOR_PROFILE_COMBO_BOX_H__ + G_BEGIN_DECLS #define GIMP_TYPE_COLOR_PROFILE_COMBO_BOX (gimp_color_profile_combo_box_get_type ()) -G_DECLARE_FINAL_TYPE (GimpColorProfileComboBox, - gimp_color_profile_combo_box, - GIMP, COLOR_PROFILE_COMBO_BOX, - GtkComboBox) +G_DECLARE_FINAL_TYPE (GimpColorProfileComboBox, gimp_color_profile_combo_box, GIMP, COLOR_PROFILE_COMBO_BOX, GtkComboBox) GtkWidget * gimp_color_profile_combo_box_new (GtkWidget *dialog, @@ -51,4 +49,7 @@ void gimp_color_profile_combo_box_set_active_profile (GimpColorProfileCom GFile * gimp_color_profile_combo_box_get_active_file (GimpColorProfileComboBox *combo); + G_END_DECLS + +#endif /* __GIMP_COLOR_PROFILE_COMBO_BOX_H__ */ diff --git a/libgimpwidgets/gimpcolorprofilestore-private.h b/libgimpwidgets/gimpcolorprofilestore-private.h index 824f9bf85b..e65f941285 100644 --- a/libgimpwidgets/gimpcolorprofilestore-private.h +++ b/libgimpwidgets/gimpcolorprofilestore-private.h @@ -19,7 +19,8 @@ * . */ -#pragma once +#ifndef __GIMP_COLOR_PROFILE_STORE_PRIVATE_H__ +#define __GIMP_COLOR_PROFILE_STORE_PRIVATE_H__ typedef enum @@ -51,3 +52,6 @@ G_GNUC_INTERNAL gboolean _gimp_color_profile_store_history_find_profile G_GNUC_INTERNAL void _gimp_color_profile_store_history_reorder (GimpColorProfileStore *store, GtkTreeIter *iter); + + +#endif /* __GIMP_COLOR_PROFILE_STORE_PRIVATE_H__ */ diff --git a/libgimpwidgets/gimpcolorprofilestore.h b/libgimpwidgets/gimpcolorprofilestore.h index 9528d95fa7..a9e8668c07 100644 --- a/libgimpwidgets/gimpcolorprofilestore.h +++ b/libgimpwidgets/gimpcolorprofilestore.h @@ -19,19 +19,18 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_COLOR_PROFILE_STORE_H__ +#define __GIMP_COLOR_PROFILE_STORE_H__ + G_BEGIN_DECLS + #define GIMP_TYPE_COLOR_PROFILE_STORE (gimp_color_profile_store_get_type ()) -G_DECLARE_FINAL_TYPE (GimpColorProfileStore, - gimp_color_profile_store, - GIMP, COLOR_PROFILE_STORE, - GtkListStore) +G_DECLARE_FINAL_TYPE (GimpColorProfileStore, gimp_color_profile_store, GIMP, COLOR_PROFILE_STORE, GtkListStore) GtkListStore * gimp_color_profile_store_new (GFile *history); @@ -40,4 +39,7 @@ void gimp_color_profile_store_add_file (GimpColorProfileStore *store, GFile *file, const gchar *label); + G_END_DECLS + +#endif /* __GIMP_COLOR_PROFILE_STORE_H__ */ diff --git a/libgimpwidgets/gimpcolorprofileview.h b/libgimpwidgets/gimpcolorprofileview.h index 13e1efc90b..d5cec19de5 100644 --- a/libgimpwidgets/gimpcolorprofileview.h +++ b/libgimpwidgets/gimpcolorprofileview.h @@ -18,16 +18,14 @@ * along with this program. If not, see . */ -#pragma once +#ifndef __GIMP_COLOR_PROFILE_VIEW_H__ +#define __GIMP_COLOR_PROFILE_VIEW_H__ G_BEGIN_DECLS #define GIMP_TYPE_COLOR_PROFILE_VIEW (gimp_color_profile_view_get_type ()) -G_DECLARE_FINAL_TYPE (GimpColorProfileView, - gimp_color_profile_view, - GIMP, COLOR_PROFILE_VIEW, - GtkTextView) +G_DECLARE_FINAL_TYPE (GimpColorProfileView, gimp_color_profile_view, GIMP, COLOR_PROFILE_VIEW, GtkTextView) GtkWidget * gimp_color_profile_view_new (void); @@ -39,3 +37,4 @@ void gimp_color_profile_view_set_error (GimpColorProfileView *view, G_END_DECLS +#endif /* __GIMP_COLOR_PROFILE_VIEW_H__ */ diff --git a/libgimpwidgets/gimpcolorscale.h b/libgimpwidgets/gimpcolorscale.h index 953407e32f..3603009c4c 100644 --- a/libgimpwidgets/gimpcolorscale.h +++ b/libgimpwidgets/gimpcolorscale.h @@ -20,19 +20,18 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_COLOR_SCALE_H__ +#define __GIMP_COLOR_SCALE_H__ + G_BEGIN_DECLS + #define GIMP_TYPE_COLOR_SCALE (gimp_color_scale_get_type ()) -G_DECLARE_FINAL_TYPE (GimpColorScale, - gimp_color_scale, - GIMP, COLOR_SCALE, - GtkScale) +G_DECLARE_FINAL_TYPE (GimpColorScale, gimp_color_scale, GIMP, COLOR_SCALE, GtkScale) GtkWidget * gimp_color_scale_new (GtkOrientation orientation, @@ -48,4 +47,7 @@ void gimp_color_scale_set_color (GimpColorScale *scale, void gimp_color_scale_set_color_config (GimpColorScale *scale, GimpColorConfig *config); + G_END_DECLS + +#endif /* __GIMP_COLOR_SCALE_H__ */ diff --git a/libgimpwidgets/gimpcolorscaleentry.h b/libgimpwidgets/gimpcolorscaleentry.h index 3a31f14bca..bb7bd9ea88 100644 --- a/libgimpwidgets/gimpcolorscaleentry.h +++ b/libgimpwidgets/gimpcolorscaleentry.h @@ -19,27 +19,27 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_COLOR_SCALE_ENTRY_H__ +#define __GIMP_COLOR_SCALE_ENTRY_H__ + #include G_BEGIN_DECLS #define GIMP_TYPE_COLOR_SCALE_ENTRY (gimp_color_scale_entry_get_type ()) -G_DECLARE_FINAL_TYPE (GimpColorScaleEntry, - gimp_color_scale_entry, - GIMP, COLOR_SCALE_ENTRY, - GimpScaleEntry) +G_DECLARE_FINAL_TYPE (GimpColorScaleEntry, gimp_color_scale_entry, GIMP, COLOR_SCALE_ENTRY, GimpScaleEntry) +GtkWidget * gimp_color_scale_entry_new (const gchar *text, + gdouble value, + gdouble lower, + gdouble upper, + guint digits); -GtkWidget * gimp_color_scale_entry_new (const gchar *text, - gdouble value, - gdouble lower, - gdouble upper, - guint digits); G_END_DECLS + +#endif /* __GIMP_COLOR_SCALE_ENTRY_H__ */ diff --git a/libgimpwidgets/gimpcolorscales.h b/libgimpwidgets/gimpcolorscales.h index 563907b735..97dfca575c 100644 --- a/libgimpwidgets/gimpcolorscales.h +++ b/libgimpwidgets/gimpcolorscales.h @@ -22,25 +22,27 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_COLOR_SCALES_H__ +#define __GIMP_COLOR_SCALES_H__ + #include G_BEGIN_DECLS + #define GIMP_TYPE_COLOR_SCALES (gimp_color_scales_get_type ()) -G_DECLARE_FINAL_TYPE (GimpColorScales, - gimp_color_scales, - GIMP, COLOR_SCALES, - GimpColorSelector) +G_DECLARE_FINAL_TYPE (GimpColorScales, gimp_color_scales, GIMP, COLOR_SCALES, GimpColorSelector) void gimp_color_scales_set_show_rgb_u8 (GimpColorScales *scales, gboolean show_rgb_u8); gboolean gimp_color_scales_get_show_rgb_u8 (GimpColorScales *scales); + G_END_DECLS + +#endif /* __GIMP_COLOR_SCALES_H__ */ diff --git a/libgimpwidgets/gimpcolorselect.h b/libgimpwidgets/gimpcolorselect.h index d0d4ef75eb..922b91119b 100644 --- a/libgimpwidgets/gimpcolorselect.h +++ b/libgimpwidgets/gimpcolorselect.h @@ -22,14 +22,16 @@ * . */ -#pragma once +#ifndef __GIMP_COLOR_SELECT_H__ +#define __GIMP_COLOR_SELECT_H__ G_BEGIN_DECLS + #define GIMP_TYPE_COLOR_SELECT (gimp_color_select_get_type ()) -G_DECLARE_FINAL_TYPE (GimpColorSelect, - gimp_color_select, - GIMP, COLOR_SELECT, - GimpColorSelector) +G_DECLARE_FINAL_TYPE (GimpColorSelect, gimp_color_select, GIMP, COLOR_SELECT, GimpColorSelector) + G_END_DECLS + +#endif /* __GIMP_COLOR_SELECT_H__ */ diff --git a/libgimpwidgets/gimpcolorselection.h b/libgimpwidgets/gimpcolorselection.h index b9e77d5128..1b64843bb6 100644 --- a/libgimpwidgets/gimpcolorselection.h +++ b/libgimpwidgets/gimpcolorselection.h @@ -19,22 +19,20 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_COLOR_SELECTION_H__ +#define __GIMP_COLOR_SELECTION_H__ + G_BEGIN_DECLS /* For information look at the html documentation */ #define GIMP_TYPE_COLOR_SELECTION (gimp_color_selection_get_type ()) -G_DECLARE_FINAL_TYPE (GimpColorSelection, - gimp_color_selection, - GIMP, COLOR_SELECTION, - GtkBox) +G_DECLARE_FINAL_TYPE (GimpColorSelection, gimp_color_selection, GIMP, COLOR_SELECTION, GtkBox) GtkWidget * gimp_color_selection_new (void); @@ -68,4 +66,7 @@ void gimp_color_selection_set_config (GimpColorSelection *selection, GtkWidget * gimp_color_selection_get_notebook (GimpColorSelection *selection); GtkWidget * gimp_color_selection_get_right_vbox (GimpColorSelection *selection); + G_END_DECLS + +#endif /* __GIMP_COLOR_SELECTION_H__ */ diff --git a/libgimpwidgets/gimpcolorselector.h b/libgimpwidgets/gimpcolorselector.h index ce673d0894..98442059e7 100644 --- a/libgimpwidgets/gimpcolorselector.h +++ b/libgimpwidgets/gimpcolorselector.h @@ -23,12 +23,13 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_COLOR_SELECTOR_H__ +#define __GIMP_COLOR_SELECTOR_H__ + G_BEGIN_DECLS /* For information look at the html documentation */ @@ -52,11 +53,7 @@ G_BEGIN_DECLS #define GIMP_TYPE_COLOR_SELECTOR (gimp_color_selector_get_type ()) -G_DECLARE_DERIVABLE_TYPE (GimpColorSelector, - gimp_color_selector, - GIMP, COLOR_SELECTOR, - GtkBox) - +G_DECLARE_DERIVABLE_TYPE (GimpColorSelector, gimp_color_selector, GIMP, COLOR_SELECTOR, GtkBox) struct _GimpColorSelectorClass { @@ -162,4 +159,7 @@ gboolean gimp_color_selector_get_simulation (GimpColorSelector gboolean gimp_color_selector_enable_simulation (GimpColorSelector *selector, gboolean enabled); + G_END_DECLS + +#endif /* __GIMP_COLOR_SELECTOR_H__ */ diff --git a/libgimpwidgets/gimpcontroller.h b/libgimpwidgets/gimpcontroller.h index 2632977756..cbdb49d1e1 100644 --- a/libgimpwidgets/gimpcontroller.h +++ b/libgimpwidgets/gimpcontroller.h @@ -19,12 +19,13 @@ * . */ -#pragma once - #ifndef GIMP_ENABLE_CONTROLLER_UNDER_CONSTRUCTION #error GimpController is unstable API under construction #endif +#ifndef __GIMP_CONTROLLER_H__ +#define __GIMP_CONTROLLER_H__ + G_BEGIN_DECLS /* For information look at the html documentation */ @@ -116,11 +117,7 @@ union _GimpControllerEvent #define GIMP_TYPE_CONTROLLER (gimp_controller_get_type ()) -G_DECLARE_DERIVABLE_TYPE (GimpController, - gimp_controller, - GIMP, CONTROLLER, - GObject) - +G_DECLARE_DERIVABLE_TYPE (GimpController, gimp_controller, GIMP, CONTROLLER, GObject) struct _GimpControllerClass { @@ -170,4 +167,7 @@ const gchar * gimp_controller_get_event_blurb (GimpController *controller, gboolean gimp_controller_event (GimpController *controller, const GimpControllerEvent *event); + G_END_DECLS + +#endif /* __GIMP_CONTROLLER_H__ */ diff --git a/libgimpwidgets/gimpdialog.h b/libgimpwidgets/gimpdialog.h index 9923c4d57e..1690bb13f1 100644 --- a/libgimpwidgets/gimpdialog.h +++ b/libgimpwidgets/gimpdialog.h @@ -19,23 +19,20 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_DIALOG_H__ +#define __GIMP_DIALOG_H__ + G_BEGIN_DECLS /* For information look into the C source or the html documentation */ #define GIMP_TYPE_DIALOG (gimp_dialog_get_type ()) -G_DECLARE_DERIVABLE_TYPE (GimpDialog, - gimp_dialog, - GIMP, DIALOG, - GtkDialog) - +G_DECLARE_DERIVABLE_TYPE (GimpDialog, gimp_dialog, GIMP, DIALOG, GtkDialog) struct _GimpDialogClass { @@ -91,7 +88,6 @@ GBytes * gimp_dialog_get_native_handle (GimpDialog *dialog); /* for internal use only! */ void gimp_dialogs_show_help_button (gboolean show); - /* gimp_dialog_set_alternative_button_order() doesn't need a dedicated * wrapper function because anyway it won't be introspectable. * GObject-Introspection bindings will have to use @@ -102,4 +98,7 @@ void gimp_dialogs_show_help_button (gboolean show); gtk_dialog_set_alternative_button_order(d,f); \ G_GNUC_END_IGNORE_DEPRECATIONS; + G_END_DECLS + +#endif /* __GIMP_DIALOG_H__ */ diff --git a/libgimpwidgets/gimpeevl.h b/libgimpwidgets/gimpeevl.h index 4c960d3651..bbcb69bdc5 100644 --- a/libgimpwidgets/gimpeevl.h +++ b/libgimpwidgets/gimpeevl.h @@ -20,10 +20,12 @@ * . */ -#pragma once +#ifndef __GIMP_EEVL_H__ +#define __GIMP_EEVL_H__ G_BEGIN_DECLS + /** * GimpEevlQuantity: * @value: In reference units. @@ -91,4 +93,7 @@ gboolean gimp_eevl_evaluate (const gchar *string, const gchar **error_pos, GError **error); + G_END_DECLS + +#endif /* __GIMP_EEVL_H__ */ diff --git a/libgimpwidgets/gimpenumcombobox.h b/libgimpwidgets/gimpenumcombobox.h index 4de433d76d..779dda0a89 100644 --- a/libgimpwidgets/gimpenumcombobox.h +++ b/libgimpwidgets/gimpenumcombobox.h @@ -19,22 +19,19 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_ENUM_COMBO_BOX_H__ +#define __GIMP_ENUM_COMBO_BOX_H__ + #include G_BEGIN_DECLS #define GIMP_TYPE_ENUM_COMBO_BOX (gimp_enum_combo_box_get_type ()) -G_DECLARE_DERIVABLE_TYPE (GimpEnumComboBox, - gimp_enum_combo_box, - GIMP, ENUM_COMBO_BOX, - GimpIntComboBox) - +G_DECLARE_DERIVABLE_TYPE (GimpEnumComboBox, gimp_enum_combo_box, GIMP, ENUM_COMBO_BOX, GimpIntComboBox) struct _GimpEnumComboBoxClass { @@ -61,3 +58,5 @@ void gimp_enum_combo_box_set_icon_prefix (GimpEnumComboBox *combo_box, const gchar *icon_prefix); G_END_DECLS + +#endif /* __GIMP_ENUM_COMBO_BOX_H__ */ diff --git a/libgimpwidgets/gimpenumlabel.h b/libgimpwidgets/gimpenumlabel.h index 863f7add3d..4057437c47 100644 --- a/libgimpwidgets/gimpenumlabel.h +++ b/libgimpwidgets/gimpenumlabel.h @@ -19,24 +19,26 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_ENUM__LABEL_H__ +#define __GIMP_ENUM__LABEL_H__ + G_BEGIN_DECLS + #define GIMP_TYPE_ENUM_LABEL (gimp_enum_label_get_type ()) -G_DECLARE_FINAL_TYPE (GimpEnumLabel, - gimp_enum_label, - GIMP, ENUM_LABEL, - GtkScale) +G_DECLARE_FINAL_TYPE (GimpEnumLabel, gimp_enum_label, GIMP, ENUM_LABEL, GtkScale) -GtkWidget * gimp_enum_label_new (GType enum_type, - gint value); -void gimp_enum_label_set_value (GimpEnumLabel *label, - gint value); +GtkWidget * gimp_enum_label_new (GType enum_type, + gint value); +void gimp_enum_label_set_value (GimpEnumLabel *label, + gint value); + G_END_DECLS + +#endif /* __GIMP_ENUM_LABEL_H__ */ diff --git a/libgimpwidgets/gimpenumstore.h b/libgimpwidgets/gimpenumstore.h index 53f306270a..02ba8ea30a 100644 --- a/libgimpwidgets/gimpenumstore.h +++ b/libgimpwidgets/gimpenumstore.h @@ -19,21 +19,20 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_ENUM_STORE_H__ +#define __GIMP_ENUM_STORE_H__ + #include + G_BEGIN_DECLS #define GIMP_TYPE_ENUM_STORE (gimp_enum_store_get_type ()) -G_DECLARE_FINAL_TYPE (GimpEnumStore, - gimp_enum_store, - GIMP, ENUM_STORE, - GimpIntStore) +G_DECLARE_FINAL_TYPE (GimpEnumStore, gimp_enum_store, GIMP, ENUM_STORE, GimpIntStore) GtkListStore * gimp_enum_store_new (GType enum_type); @@ -50,4 +49,7 @@ GtkListStore * gimp_enum_store_new_with_values_valist (GType enum_type, void gimp_enum_store_set_icon_prefix (GimpEnumStore *store, const gchar *icon_prefix); + G_END_DECLS + +#endif /* __GIMP_ENUM_STORE_H__ */ diff --git a/libgimpwidgets/gimpenumwidgets.h b/libgimpwidgets/gimpenumwidgets.h index 62d2d79bdf..f7277a44ca 100644 --- a/libgimpwidgets/gimpenumwidgets.h +++ b/libgimpwidgets/gimpenumwidgets.h @@ -19,14 +19,16 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_ENUM_WIDGETS_H__ +#define __GIMP_ENUM_WIDGETS_H__ + G_BEGIN_DECLS + GtkWidget * gimp_enum_radio_box_new (GType enum_type, GCallback callback, gpointer callback_data, @@ -78,3 +80,5 @@ void gimp_enum_icon_box_set_icon_size (GtkWidget *icon_box, GtkIconSize icon_size); G_END_DECLS + +#endif /* __GIMP_ENUM_WIDGETS_H__ */ diff --git a/libgimpwidgets/gimpfilechooser.h b/libgimpwidgets/gimpfilechooser.h index dcbcf6a7f5..b856aae614 100644 --- a/libgimpwidgets/gimpfilechooser.h +++ b/libgimpwidgets/gimpfilechooser.h @@ -19,19 +19,17 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_FILE_CHOOSER_H__ +#define __GIMP_FILE_CHOOSER_H__ + G_BEGIN_DECLS #define GIMP_TYPE_FILE_CHOOSER (gimp_file_chooser_get_type ()) -G_DECLARE_FINAL_TYPE (GimpFileChooser, - gimp_file_chooser, - GIMP, FILE_CHOOSER, - GtkBox) +G_DECLARE_FINAL_TYPE (GimpFileChooser, gimp_file_chooser, GIMP, FILE_CHOOSER, GtkBox) GtkWidget * gimp_file_chooser_new (GimpFileChooserAction action, @@ -57,4 +55,7 @@ void gimp_file_chooser_set_title (GimpFileChooser GtkWidget * gimp_file_chooser_get_label_widget (GimpFileChooser *chooser); + G_END_DECLS + +#endif /* __GIMP_FILE_CHOOSER_H__ */ diff --git a/libgimpwidgets/gimpfileentry.h b/libgimpwidgets/gimpfileentry.h index 18bd76f7c2..5955c76f90 100644 --- a/libgimpwidgets/gimpfileentry.h +++ b/libgimpwidgets/gimpfileentry.h @@ -19,14 +19,15 @@ * . */ -#pragma once - #ifndef GIMP_DISABLE_DEPRECATED #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_FILE_ENTRY_H__ +#define __GIMP_FILE_ENTRY_H__ + G_BEGIN_DECLS /* For information look into the C source or the html documentation */ @@ -43,10 +44,7 @@ G_BEGIN_DECLS */ #define GIMP_TYPE_FILE_ENTRY (_gimp_file_entry_get_type ()) -G_DECLARE_FINAL_TYPE (GimpFileEntry, - _gimp_file_entry, - GIMP, FILE_ENTRY, - GtkBox) +G_DECLARE_FINAL_TYPE (GimpFileEntry, _gimp_file_entry, GIMP, FILE_ENTRY, GtkBox) G_GNUC_INTERNAL GtkWidget * _gimp_file_entry_new (const gchar *title, @@ -60,6 +58,9 @@ G_GNUC_INTERNAL void _gimp_file_entry_set_filename (GimpFileEntry *entry, G_GNUC_INTERNAL GtkWidget * _gimp_file_entry_get_entry (GimpFileEntry *entry); + G_END_DECLS +#endif /* __GIMP_FILE_ENTRY_H__ */ + #endif /* GIMP_DISABLE_DEPRECATED */ diff --git a/libgimpwidgets/gimpframe.h b/libgimpwidgets/gimpframe.h index fa781e3460..a223c26081 100644 --- a/libgimpwidgets/gimpframe.h +++ b/libgimpwidgets/gimpframe.h @@ -19,23 +19,20 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_FRAME_H__ +#define __GIMP_FRAME_H__ + G_BEGIN_DECLS /* For information look into the C source or the html documentation */ #define GIMP_TYPE_FRAME (gimp_frame_get_type ()) -G_DECLARE_DERIVABLE_TYPE (GimpFrame, - gimp_frame, - GIMP, FRAME, - GtkFrame) - +G_DECLARE_DERIVABLE_TYPE (GimpFrame, gimp_frame, GIMP, FRAME, GtkFrame) struct _GimpFrameClass { @@ -55,6 +52,9 @@ struct _GimpFrameClass }; -GtkWidget * gimp_frame_new (const gchar *label); +GtkWidget * gimp_frame_new (const gchar *label); + G_END_DECLS + +#endif /* __GIMP_FRAME_H__ */ diff --git a/libgimpwidgets/gimphelpui.h b/libgimpwidgets/gimphelpui.h index 60d7011887..db3f33dc1b 100644 --- a/libgimpwidgets/gimphelpui.h +++ b/libgimpwidgets/gimphelpui.h @@ -19,12 +19,13 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_HELP_UI_H__ +#define __GIMP_HELP_UI_H__ + G_BEGIN_DECLS /* For information look into the C source or the html documentation */ @@ -68,4 +69,7 @@ void gimp_context_help (GtkWidget *widget); GQuark gimp_help_id_quark (void) G_GNUC_CONST; + G_END_DECLS + +#endif /* __GIMP_HELP_UI_H__ */ diff --git a/libgimpwidgets/gimphintbox.h b/libgimpwidgets/gimphintbox.h index 4f10ae34b6..40b2b092af 100644 --- a/libgimpwidgets/gimphintbox.h +++ b/libgimpwidgets/gimphintbox.h @@ -19,24 +19,25 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_HINT_BOX_H__ +#define __GIMP_HINT_BOX_H__ + G_BEGIN_DECLS /* For information look into the C source or the html documentation */ #define GIMP_TYPE_HINT_BOX (gimp_hint_box_get_type ()) -G_DECLARE_FINAL_TYPE (GimpHintBox, - gimp_hint_box, - GIMP, HINT_BOX, - GtkBox) +G_DECLARE_FINAL_TYPE (GimpHintBox, gimp_hint_box, GIMP, HINT_BOX, GtkBox) -GtkWidget * gimp_hint_box_new (const gchar *hint); +GtkWidget * gimp_hint_box_new (const gchar *hint); + G_END_DECLS + +#endif /* __GIMP_HINT_BOX_H__ */ diff --git a/libgimpwidgets/gimpicons.h b/libgimpwidgets/gimpicons.h index 23b3903e34..1eccb8be22 100644 --- a/libgimpwidgets/gimpicons.h +++ b/libgimpwidgets/gimpicons.h @@ -19,12 +19,13 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_ICONS_H__ +#define __GIMP_ICONS_H__ + G_BEGIN_DECLS /* For information look into the C source or the html documentation */ @@ -433,4 +434,7 @@ void gimp_icons_init (void); gboolean gimp_icons_set_icon_theme (GFile *path); + G_END_DECLS + +#endif /* __GIMP_ICONS_H__ */ diff --git a/libgimpwidgets/gimpintcombobox.h b/libgimpwidgets/gimpintcombobox.h index ce5458a309..442bf47827 100644 --- a/libgimpwidgets/gimpintcombobox.h +++ b/libgimpwidgets/gimpintcombobox.h @@ -19,19 +19,18 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_INT_COMBO_BOX_H__ +#define __GIMP_INT_COMBO_BOX_H__ + G_BEGIN_DECLS + #define GIMP_TYPE_INT_COMBO_BOX (gimp_int_combo_box_get_type ()) -G_DECLARE_DERIVABLE_TYPE (GimpIntComboBox, - gimp_int_combo_box, - GIMP, INT_COMBO_BOX, - GtkComboBox) +G_DECLARE_DERIVABLE_TYPE (GimpIntComboBox, gimp_int_combo_box, GIMP, INT_COMBO_BOX, GtkComboBox) struct _GimpIntComboBoxClass @@ -108,4 +107,7 @@ void gimp_int_combo_box_set_sensitivity (GimpIntComboBox *combo_ gpointer data, GDestroyNotify destroy); + G_END_DECLS + +#endif /* __GIMP_INT_COMBO_BOX_H__ */ diff --git a/libgimpwidgets/gimpintradioframe.h b/libgimpwidgets/gimpintradioframe.h index 423e71d2f0..5a92f66f07 100644 --- a/libgimpwidgets/gimpintradioframe.h +++ b/libgimpwidgets/gimpintradioframe.h @@ -19,21 +19,20 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif #include +#ifndef __GIMP_INT_RADIO_FRAME_H__ +#define __GIMP_INT_RADIO_FRAME_H__ + G_BEGIN_DECLS + #define GIMP_TYPE_INT_RADIO_FRAME (gimp_int_radio_frame_get_type ()) -G_DECLARE_FINAL_TYPE (GimpIntRadioFrame, - gimp_int_radio_frame, - GIMP, INT_RADIO_FRAME, - GimpFrame) +G_DECLARE_FINAL_TYPE (GimpIntRadioFrame, gimp_int_radio_frame, GIMP, INT_RADIO_FRAME, GimpFrame) /** @@ -61,6 +60,7 @@ typedef gboolean (* GimpIntRadioFrameSensitivityFunc) (gint value, gpointer data); + GtkWidget * gimp_int_radio_frame_new_from_store (const gchar *title, GimpIntStore *store); GtkWidget * gimp_int_radio_frame_new (const gchar *first_label, @@ -97,4 +97,7 @@ void gimp_int_radio_frame_set_sensitivity (GimpIntRadioFrame *radio_fra gpointer data, GDestroyNotify destroy); + G_END_DECLS + +#endif /* __GIMP_INT_RADIO_FRAME_H__ */ diff --git a/libgimpwidgets/gimpintstore.h b/libgimpwidgets/gimpintstore.h index e31fa4f68d..adfc565e69 100644 --- a/libgimpwidgets/gimpintstore.h +++ b/libgimpwidgets/gimpintstore.h @@ -19,14 +19,16 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_INT_STORE_H__ +#define __GIMP_INT_STORE_H__ + G_BEGIN_DECLS + /** * GimpIntStoreColumns: * @GIMP_INT_STORE_VALUE: the integer value @@ -52,11 +54,7 @@ typedef enum #define GIMP_TYPE_INT_STORE (gimp_int_store_get_type ()) -G_DECLARE_DERIVABLE_TYPE (GimpIntStore, - gimp_int_store, - GIMP, INT_STORE, - GtkListStore) - +G_DECLARE_DERIVABLE_TYPE (GimpIntStore, gimp_int_store, GIMP, INT_STORE, GtkListStore) struct _GimpIntStoreClass { @@ -92,4 +90,7 @@ gboolean gimp_int_store_lookup_by_user_data (GtkTreeModel *model, gpointer user_data, GtkTreeIter *iter); + G_END_DECLS + +#endif /* __GIMP_INT_STORE_H__ */ diff --git a/libgimpwidgets/gimplabelcolor.h b/libgimpwidgets/gimplabelcolor.h index 81f3a4b71e..31ad8375e7 100644 --- a/libgimpwidgets/gimplabelcolor.h +++ b/libgimpwidgets/gimplabelcolor.h @@ -19,40 +19,40 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_LABEL_COLOR_H__ +#define __GIMP_LABEL_COLOR_H__ + #include G_BEGIN_DECLS #define GIMP_TYPE_LABEL_COLOR (gimp_label_color_get_type ()) -G_DECLARE_FINAL_TYPE (GimpLabelColor, - gimp_label_color, - GIMP, LABEL_COLOR, - GimpLabeled) +G_DECLARE_FINAL_TYPE (GimpLabelColor, gimp_label_color, GIMP, LABEL_COLOR, GimpLabeled) -GtkWidget * gimp_label_color_new (const gchar *label, - GeglColor *color, - gboolean editable); +GtkWidget * gimp_label_color_new (const gchar *label, + GeglColor *color, + gboolean editable); /* TODO: it would be interesting for such a widget to have an API to * customize the label being also above or below, left or right. I could * imagine wanting to pretty-list several colors with specific layouts. */ -void gimp_label_color_set_value (GimpLabelColor *color, - GeglColor *value); -GeglColor * gimp_label_color_get_value (GimpLabelColor *color); +void gimp_label_color_set_value (GimpLabelColor *color, + GeglColor *value); +GeglColor * gimp_label_color_get_value (GimpLabelColor *color); -void gimp_label_color_set_editable (GimpLabelColor *color, - gboolean editable); -gboolean gimp_label_color_is_editable (GimpLabelColor *color); +void gimp_label_color_set_editable (GimpLabelColor *color, + gboolean editable); +gboolean gimp_label_color_is_editable (GimpLabelColor *color); -GtkWidget * gimp_label_color_get_color_widget (GimpLabelColor *color); +GtkWidget * gimp_label_color_get_color_widget (GimpLabelColor *color); G_END_DECLS + +#endif /* __GIMP_LABEL_COLOR_H__ */ diff --git a/libgimpwidgets/gimplabeled.h b/libgimpwidgets/gimplabeled.h index b99bf31034..6c7f0e406b 100644 --- a/libgimpwidgets/gimplabeled.h +++ b/libgimpwidgets/gimplabeled.h @@ -19,26 +19,23 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_LABELED_H__ +#define __GIMP_LABELED_H__ + G_BEGIN_DECLS #define GIMP_TYPE_LABELED (gimp_labeled_get_type ()) -G_DECLARE_DERIVABLE_TYPE (GimpLabeled, - gimp_labeled, - GIMP, LABELED, - GtkGrid) - +G_DECLARE_DERIVABLE_TYPE (GimpLabeled, gimp_labeled, GIMP, LABELED, GtkGrid) struct _GimpLabeledClass { - GtkGridClass parent_class; + GtkGridClass parent_class; - /* Signals */ + /* Signals */ void (* mnemonic_widget_changed) (GimpLabeled *labeled, GtkWidget *widget); @@ -58,11 +55,11 @@ struct _GimpLabeledClass * Returns: (transfer none): the #GtkWidget which the label must be * set as mnemonic to. **/ - GtkWidget * (* populate) (GimpLabeled *labeled, - gint *x, - gint *y, - gint *width, - gint *height); + GtkWidget * (* populate) (GimpLabeled *labeled, + gint *x, + gint *y, + gint *width, + gint *height); /* Padding for future expansion */ @@ -78,11 +75,13 @@ struct _GimpLabeledClass void (* _gimp_reserved9) (void); }; +GtkWidget * gimp_labeled_get_label (GimpLabeled *labeled); -GtkWidget * gimp_labeled_get_label (GimpLabeled *labeled); +const gchar * gimp_labeled_get_text (GimpLabeled *labeled); +void gimp_labeled_set_text (GimpLabeled *labeled, + const gchar *text); -const gchar * gimp_labeled_get_text (GimpLabeled *labeled); -void gimp_labeled_set_text (GimpLabeled *labeled, - const gchar *text); G_END_DECLS + +#endif /* __GIMP_LABELED_H__ */ diff --git a/libgimpwidgets/gimplabelentry.h b/libgimpwidgets/gimplabelentry.h index 4321d06943..b89ed104c7 100644 --- a/libgimpwidgets/gimplabelentry.h +++ b/libgimpwidgets/gimplabelentry.h @@ -19,21 +19,19 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_LABEL_ENTRY_H__ +#define __GIMP_LABEL_ENTRY_H__ + #include G_BEGIN_DECLS #define GIMP_TYPE_LABEL_ENTRY (gimp_label_entry_get_type ()) -G_DECLARE_FINAL_TYPE (GimpLabelEntry, - gimp_label_entry, - GIMP, LABEL_ENTRY, - GimpLabeled) +G_DECLARE_FINAL_TYPE (GimpLabelEntry, gimp_label_entry, GIMP, LABEL_ENTRY, GimpLabeled) GtkWidget * gimp_label_entry_new (const gchar *label); @@ -45,3 +43,5 @@ const gchar * gimp_label_entry_get_value (GimpLabelEntry *entry); GtkWidget * gimp_label_entry_get_entry (GimpLabelEntry *entry); G_END_DECLS + +#endif /* __GIMP_LABEL_ENTRY_H__ */ diff --git a/libgimpwidgets/gimplabelintwidget.h b/libgimpwidgets/gimplabelintwidget.h index f7d0665563..0aa2e42dd6 100644 --- a/libgimpwidgets/gimplabelintwidget.h +++ b/libgimpwidgets/gimplabelintwidget.h @@ -19,26 +19,27 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_LABEL_INT_WIDGET_H__ +#define __GIMP_LABEL_INT_WIDGET_H__ + #include G_BEGIN_DECLS #define GIMP_TYPE_LABEL_INT_WIDGET (gimp_label_int_widget_get_type ()) -G_DECLARE_FINAL_TYPE (GimpLabelIntWidget, - gimp_label_int_widget, - GIMP, LABEL_INT_WIDGET, - GimpLabeled) +G_DECLARE_FINAL_TYPE (GimpLabelIntWidget, gimp_label_int_widget, GIMP, LABEL_INT_WIDGET, GimpLabeled) -GtkWidget * gimp_label_int_widget_new (const gchar *text, - GtkWidget *widget); +GtkWidget * gimp_label_int_widget_new (const gchar *text, + GtkWidget *widget); + +GtkWidget * gimp_label_int_widget_get_widget (GimpLabelIntWidget *widget); -GtkWidget * gimp_label_int_widget_get_widget (GimpLabelIntWidget *widget); G_END_DECLS + +#endif /* __GIMP_LABEL_INT_WIDGET_H__ */ diff --git a/libgimpwidgets/gimplabelspin.h b/libgimpwidgets/gimplabelspin.h index 5a8cb71e05..689dd75b6c 100644 --- a/libgimpwidgets/gimplabelspin.h +++ b/libgimpwidgets/gimplabelspin.h @@ -19,29 +19,26 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_LABEL_SPIN_H__ +#define __GIMP_LABEL_SPIN_H__ + #include G_BEGIN_DECLS #define GIMP_TYPE_LABEL_SPIN (gimp_label_spin_get_type ()) -G_DECLARE_DERIVABLE_TYPE (GimpLabelSpin, - gimp_label_spin, - GIMP, LABEL_SPIN, - GimpLabeled) - +G_DECLARE_DERIVABLE_TYPE (GimpLabelSpin, gimp_label_spin, GIMP, LABEL_SPIN, GimpLabeled) struct _GimpLabelSpinClass { - GimpLabeledClass parent_class; + GimpLabeledClass parent_class; /* Signals */ - void (* value_changed) (GimpLabelSpin *spin); + void (* value_changed) (GimpLabelSpin *spin); /* Padding for future expansion */ void (* _gimp_reserved0) (void); @@ -56,7 +53,6 @@ struct _GimpLabelSpinClass void (* _gimp_reserved9) (void); }; - GtkWidget * gimp_label_spin_new (const gchar *text, gdouble value, gdouble lower, @@ -76,3 +72,5 @@ void gimp_label_spin_set_digits (GimpLabelSpin *spin, GtkWidget * gimp_label_spin_get_spin_button (GimpLabelSpin *spin); G_END_DECLS + +#endif /* __GIMP_LABEL_SPIN_H__ */ diff --git a/libgimpwidgets/gimplabelstringwidget.h b/libgimpwidgets/gimplabelstringwidget.h index 7739767053..f9feb02cb7 100644 --- a/libgimpwidgets/gimplabelstringwidget.h +++ b/libgimpwidgets/gimplabelstringwidget.h @@ -19,26 +19,27 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_LABEL_STRING_WIDGET_H__ +#define __GIMP_LABEL_STRING_WIDGET_H__ + #include G_BEGIN_DECLS #define GIMP_TYPE_LABEL_STRING_WIDGET (gimp_label_string_widget_get_type ()) -G_DECLARE_FINAL_TYPE (GimpLabelStringWidget, - gimp_label_string_widget, - GIMP, LABEL_STRING_WIDGET, - GimpLabeled) +G_DECLARE_FINAL_TYPE (GimpLabelStringWidget, gimp_label_string_widget, GIMP, LABEL_STRING_WIDGET, GimpLabeled) -GtkWidget * gimp_label_string_widget_new (const gchar *text, - GtkWidget *widget); +GtkWidget * gimp_label_string_widget_new (const gchar *text, + GtkWidget *widget); + +GtkWidget * gimp_label_string_widget_get_widget (GimpLabelStringWidget *widget); -GtkWidget * gimp_label_string_widget_get_widget (GimpLabelStringWidget *widget); G_END_DECLS + +#endif /* __GIMP_LABEL_STRING_WIDGET_H__ */ diff --git a/libgimpwidgets/gimpmemsizeentry.h b/libgimpwidgets/gimpmemsizeentry.h index f89b3a3642..6b96a6624c 100644 --- a/libgimpwidgets/gimpmemsizeentry.h +++ b/libgimpwidgets/gimpmemsizeentry.h @@ -19,19 +19,18 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_MEMSIZE_ENTRY_H__ +#define __GIMP_MEMSIZE_ENTRY_H__ + G_BEGIN_DECLS + #define GIMP_TYPE_MEMSIZE_ENTRY (gimp_memsize_entry_get_type ()) -G_DECLARE_FINAL_TYPE (GimpMemsizeEntry, - gimp_memsize_entry, - GIMP, MEMSIZE_ENTRY, - GtkBox) +G_DECLARE_FINAL_TYPE (GimpMemsizeEntry, gimp_memsize_entry, GIMP, MEMSIZE_ENTRY, GtkBox) GtkWidget * gimp_memsize_entry_new (guint64 value, @@ -43,4 +42,7 @@ guint64 gimp_memsize_entry_get_value (GimpMemsizeEntry *entry); GtkWidget * gimp_memsize_entry_get_spinbutton (GimpMemsizeEntry *entry); + G_END_DECLS + +#endif /* __GIMP_MEMSIZE_ENTRY_H__ */ diff --git a/libgimpwidgets/gimpnumberpairentry.h b/libgimpwidgets/gimpnumberpairentry.h index 96a5a9fa12..635534cfe1 100644 --- a/libgimpwidgets/gimpnumberpairentry.h +++ b/libgimpwidgets/gimpnumberpairentry.h @@ -21,19 +21,18 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_NUMBER_PAIR_ENTRY_H__ +#define __GIMP_NUMBER_PAIR_ENTRY_H__ + G_BEGIN_DECLS + #define GIMP_TYPE_NUMBER_PAIR_ENTRY (gimp_number_pair_entry_get_type ()) -G_DECLARE_FINAL_TYPE (GimpNumberPairEntry, - gimp_number_pair_entry, - GIMP, NUMBER_PAIR_ENTRY, - GtkEntry) +G_DECLARE_FINAL_TYPE (GimpNumberPairEntry, gimp_number_pair_entry, GIMP, NUMBER_PAIR_ENTRY, GtkEntry) GtkWidget * gimp_number_pair_entry_new (const gchar *separators, @@ -69,4 +68,7 @@ void gimp_number_pair_entry_set_user_override (GimpNumberPairEntry *e gboolean user_override); gboolean gimp_number_pair_entry_get_user_override (GimpNumberPairEntry *entry); + G_END_DECLS + +#endif /* __GIMP_NUMBER_PAIR_ENTRY_H__ */ diff --git a/libgimpwidgets/gimpoffsetarea.h b/libgimpwidgets/gimpoffsetarea.h index d196fdf3f4..eabe5ab2f1 100644 --- a/libgimpwidgets/gimpoffsetarea.h +++ b/libgimpwidgets/gimpoffsetarea.h @@ -19,21 +19,20 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_OFFSET_AREA_H__ +#define __GIMP_OFFSET_AREA_H__ + G_BEGIN_DECLS + /* For information look into the C source or the html documentation */ #define GIMP_TYPE_OFFSET_AREA (gimp_offset_area_get_type ()) -G_DECLARE_FINAL_TYPE (GimpOffsetArea, - gimp_offset_area, - GIMP, OFFSET_AREA, - GtkDrawingArea) +G_DECLARE_FINAL_TYPE (GimpOffsetArea, gimp_offset_area, GIMP, OFFSET_AREA, GtkDrawingArea) GtkWidget * gimp_offset_area_new (gint orig_width, @@ -48,4 +47,7 @@ void gimp_offset_area_set_offsets (GimpOffsetArea *offset_area, gint offset_x, gint offset_y); + G_END_DECLS + +#endif /* __GIMP_OFFSET_AREA_H__ */ diff --git a/libgimpwidgets/gimppageselector.h b/libgimpwidgets/gimppageselector.h index 7f4d43fef0..de0e502f1b 100644 --- a/libgimpwidgets/gimppageselector.h +++ b/libgimpwidgets/gimppageselector.h @@ -19,19 +19,17 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_PAGE_SELECTOR_H__ +#define __GIMP_PAGE_SELECTOR_H__ + G_BEGIN_DECLS #define GIMP_TYPE_PAGE_SELECTOR (gimp_page_selector_get_type ()) -G_DECLARE_FINAL_TYPE (GimpPageSelector, - gimp_page_selector, - GIMP, PAGE_SELECTOR, - GtkBox) +G_DECLARE_FINAL_TYPE (GimpPageSelector, gimp_page_selector, GIMP, PAGE_SELECTOR, GtkBox) GtkWidget * gimp_page_selector_new (void); @@ -73,3 +71,5 @@ void gimp_page_selector_select_range (GimpPageSelector *selector, gchar * gimp_page_selector_get_selected_range (GimpPageSelector *selector); G_END_DECLS + +#endif /* __GIMP_PAGE_SELECTOR_H__ */ diff --git a/libgimpwidgets/gimppatheditor.h b/libgimpwidgets/gimppatheditor.h index cef287ec0b..b99b07ac2a 100644 --- a/libgimpwidgets/gimppatheditor.h +++ b/libgimpwidgets/gimppatheditor.h @@ -19,24 +19,24 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_PATH_EDITOR_H__ +#define __GIMP_PATH_EDITOR_H__ + G_BEGIN_DECLS /* For information look into the C source or the html documentation */ #define GIMP_TYPE_PATH_EDITOR (gimp_path_editor_get_type ()) -G_DECLARE_FINAL_TYPE (GimpPathEditor, - gimp_path_editor, - GIMP, PATH_EDITOR, - GtkBox) +G_DECLARE_FINAL_TYPE (GimpPathEditor, gimp_path_editor, GIMP, PATH_EDITOR, GtkBox) +/* For information look into the C source or the html documentation */ + GtkWidget * gimp_path_editor_new (const gchar *title, const gchar *path); @@ -55,3 +55,5 @@ void gimp_path_editor_set_dir_writable (GimpPathEditor *editor, gboolean writable); G_END_DECLS + +#endif /* __GIMP_PATH_EDITOR_H__ */ diff --git a/libgimpwidgets/gimppickbutton-kwin.h b/libgimpwidgets/gimppickbutton-kwin.h index 8518c6a673..4f596afbe6 100644 --- a/libgimpwidgets/gimppickbutton-kwin.h +++ b/libgimpwidgets/gimppickbutton-kwin.h @@ -15,9 +15,11 @@ */ /* Private header file which is not meant to be exported. */ +#ifndef __GIMP_PICK_BUTTON_KWIN_H__ +#define __GIMP_PICK_BUTTON_KWIN_H__ -#pragma once +gboolean _gimp_pick_button_kwin_available (void); +void _gimp_pick_button_kwin_pick (GimpPickButton *button); +#endif /* __GIMP_PICK_BUTTON_KWIN_H__ */ -G_GNUC_INTERNAL gboolean _gimp_pick_button_kwin_available (void); -G_GNUC_INTERNAL void _gimp_pick_button_kwin_pick (GimpPickButton *button); diff --git a/libgimpwidgets/gimppickbutton-private.h b/libgimpwidgets/gimppickbutton-private.h index afc75fb1d7..564132e750 100644 --- a/libgimpwidgets/gimppickbutton-private.h +++ b/libgimpwidgets/gimppickbutton-private.h @@ -13,7 +13,8 @@ * . */ -#pragma once +#ifndef __GIMP_PICK_BUTTON_PRIVATE_H__ +#define __GIMP_PICK_BUTTON_PRIVATE_H__ typedef struct _GimpPickButtonPrivate @@ -22,3 +23,5 @@ typedef struct _GimpPickButtonPrivate GtkWidget *grab_widget; } GimpPickButtonPrivate; + +#endif /* ! __GIMP_PICK_BUTTON_PRIVATE_H__ */ diff --git a/libgimpwidgets/gimppickbutton-quartz.h b/libgimpwidgets/gimppickbutton-quartz.h index 9d203c0d89..53f1ce42e4 100644 --- a/libgimpwidgets/gimppickbutton-quartz.h +++ b/libgimpwidgets/gimppickbutton-quartz.h @@ -15,10 +15,11 @@ */ /* Private header file which is not meant to be exported. */ +#ifndef __GIMP_PICK_BUTTON_QUARTZ_H__ +#define __GIMP_PICK_BUTTON_QUARTZ_H__ -#pragma once - - -G_GNUC_INTERNAL void _gimp_pick_button_quartz_pick (GimpPickButton *button); +void _gimp_pick_button_quartz_pick (GimpPickButton *button); + +#endif /* __GIMP_PICK_BUTTON_QUARTZ_H__ */ diff --git a/libgimpwidgets/gimppickbutton-win32.h b/libgimpwidgets/gimppickbutton-win32.h index 88748beaee..eaeaa776ec 100644 --- a/libgimpwidgets/gimppickbutton-win32.h +++ b/libgimpwidgets/gimppickbutton-win32.h @@ -15,8 +15,9 @@ */ /* Private header file which is not meant to be exported. */ - -#pragma once - +#ifndef __GIMP_PICK_BUTTON_WIN32_H__ +#define __GIMP_PICK_BUTTON_WIN32_H__ G_GNUC_INTERNAL void _gimp_pick_button_win32_pick (GimpPickButton *button); + +#endif /* __GIMP_PICK_BUTTON_WIN32_H__ */ diff --git a/libgimpwidgets/gimppickbutton-xdg.h b/libgimpwidgets/gimppickbutton-xdg.h index 41eaa60aeb..394665e3bb 100644 --- a/libgimpwidgets/gimppickbutton-xdg.h +++ b/libgimpwidgets/gimppickbutton-xdg.h @@ -15,10 +15,11 @@ */ /* Private header file which is not meant to be exported. */ +#ifndef __GIMP_PICK_BUTTON_XDG_H__ +#define __GIMP_PICK_BUTTON_XDG_H__ -#pragma once +gboolean _gimp_pick_button_xdg_available (void); +void _gimp_pick_button_xdg_pick (GimpPickButton *button); - -G_GNUC_INTERNAL gboolean _gimp_pick_button_xdg_available (void); -G_GNUC_INTERNAL void _gimp_pick_button_xdg_pick (GimpPickButton *button); +#endif /* __GIMP_PICK_BUTTON_XDG_H__ */ diff --git a/libgimpwidgets/gimppickbutton.h b/libgimpwidgets/gimppickbutton.h index fbf7de413c..d14bebd126 100644 --- a/libgimpwidgets/gimppickbutton.h +++ b/libgimpwidgets/gimppickbutton.h @@ -16,20 +16,18 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_PICK_BUTTON_H__ +#define __GIMP_PICK_BUTTON_H__ + G_BEGIN_DECLS -#define GIMP_TYPE_PICK_BUTTON (gimp_pick_button_get_type ()) -G_DECLARE_DERIVABLE_TYPE (GimpPickButton, - gimp_pick_button, - GIMP, PICK_BUTTON, - GtkButton) +#define GIMP_TYPE_PICK_BUTTON (gimp_pick_button_get_type ()) +G_DECLARE_DERIVABLE_TYPE (GimpPickButton, gimp_pick_button, GIMP, PICK_BUTTON, GtkButton) struct _GimpPickButtonClass { @@ -52,10 +50,12 @@ struct _GimpPickButtonClass }; -GtkWidget * gimp_pick_button_new (void); +GtkWidget * gimp_pick_button_new (void); /* for internal use only */ G_GNUC_INTERNAL void _gimp_pick_button_default_pick (GimpPickButton *button); + G_END_DECLS +#endif /* __GIMP_PICK_BUTTON_H__ */ diff --git a/libgimpwidgets/gimppreview.h b/libgimpwidgets/gimppreview.h index 5af3aab187..0eb2008e9b 100644 --- a/libgimpwidgets/gimppreview.h +++ b/libgimpwidgets/gimppreview.h @@ -18,23 +18,21 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_PREVIEW_H__ +#define __GIMP_PREVIEW_H__ + G_BEGIN_DECLS + /* For information look into the C source or the html documentation */ #define GIMP_TYPE_PREVIEW (gimp_preview_get_type ()) -G_DECLARE_DERIVABLE_TYPE (GimpPreview, - gimp_preview, - GIMP, PREVIEW, - GtkBox) - +G_DECLARE_DERIVABLE_TYPE (GimpPreview, gimp_preview, GIMP, PREVIEW, GtkBox) struct _GimpPreviewClass { @@ -140,4 +138,7 @@ GdkCursor * gimp_preview_get_default_cursor (GimpPreview *preview); GtkWidget * gimp_preview_get_controls (GimpPreview *preview); + G_END_DECLS + +#endif /* __GIMP_PREVIEW_H__ */ diff --git a/libgimpwidgets/gimppreviewarea.h b/libgimpwidgets/gimppreviewarea.h index 16f9110408..c7f5027d7c 100644 --- a/libgimpwidgets/gimppreviewarea.h +++ b/libgimpwidgets/gimppreviewarea.h @@ -16,19 +16,18 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_PREVIEW_AREA_H__ +#define __GIMP_PREVIEW_AREA_H__ + G_BEGIN_DECLS + #define GIMP_TYPE_PREVIEW_AREA (gimp_preview_area_get_type ()) -G_DECLARE_FINAL_TYPE (GimpPreviewArea, - gimp_preview_area, - GIMP, PREVIEW_AREA, - GtkDrawingArea) +G_DECLARE_FINAL_TYPE (GimpPreviewArea, gimp_preview_area, GIMP, PREVIEW_AREA, GtkDrawingArea) GtkWidget * gimp_preview_area_new (void); @@ -95,4 +94,7 @@ void gimp_preview_area_set_max_size (GimpPreviewArea *area, void gimp_preview_area_menu_popup (GimpPreviewArea *area, GdkEventButton *event); + G_END_DECLS + +#endif /* __GIMP_PREVIEW_AREA_H__ */ diff --git a/libgimpwidgets/gimppropwidgets.h b/libgimpwidgets/gimppropwidgets.h index d41bd2279c..f37818941a 100644 --- a/libgimpwidgets/gimppropwidgets.h +++ b/libgimpwidgets/gimppropwidgets.h @@ -19,14 +19,16 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMPWIDGETS_PROP_WIDGETS_H__ +#define __GIMPWIDGETS_PROP_WIDGETS_H__ + G_BEGIN_DECLS + /* GParamBoolean */ GtkWidget * gimp_prop_check_button_new (GObject *config, @@ -259,5 +261,7 @@ GtkWidget * gimp_prop_icon_image_new (GObject *config, const gchar *property_name, GtkIconSize icon_size); + G_END_DECLS +#endif /* __GIMPWIDGETS_PROP_WIDGETS_H__ */ diff --git a/libgimpwidgets/gimpquerybox.h b/libgimpwidgets/gimpquerybox.h index 34dd4917ea..8ad2295d0e 100644 --- a/libgimpwidgets/gimpquerybox.h +++ b/libgimpwidgets/gimpquerybox.h @@ -19,12 +19,13 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_QUERY_BOX_H__ +#define __GIMP_QUERY_BOX_H__ + G_BEGIN_DECLS /* For information look into the C source or the html documentation */ @@ -178,4 +179,7 @@ GtkWidget * gimp_query_boolean_box (const gchar *title, gpointer data, GDestroyNotify data_destroy); + G_END_DECLS + +#endif /* __GIMP_QUERY_BOX_H__ */ diff --git a/libgimpwidgets/gimpruler.h b/libgimpwidgets/gimpruler.h index 80328c15f5..bf826d1d76 100644 --- a/libgimpwidgets/gimpruler.h +++ b/libgimpwidgets/gimpruler.h @@ -16,19 +16,17 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_RULER_H__ +#define __GIMP_RULER_H__ + G_BEGIN_DECLS #define GIMP_TYPE_RULER (gimp_ruler_get_type ()) -G_DECLARE_FINAL_TYPE (GimpRuler, - gimp_ruler, - GIMP, RULER, - GtkWidget) +G_DECLARE_FINAL_TYPE (GimpRuler, gimp_ruler, GIMP, RULER, GtkWidget) GtkWidget * gimp_ruler_new (GtkOrientation orientation); @@ -54,3 +52,5 @@ void gimp_ruler_get_range (GimpRuler *ruler, gdouble *max_size); G_END_DECLS + +#endif /* __GIMP_RULER_H__ */ diff --git a/libgimpwidgets/gimpscaleentry.h b/libgimpwidgets/gimpscaleentry.h index 2aa54716cf..b41657f369 100644 --- a/libgimpwidgets/gimpscaleentry.h +++ b/libgimpwidgets/gimpscaleentry.h @@ -21,29 +21,26 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif #include +#ifndef __GIMP_SCALE_ENTRY_H__ +#define __GIMP_SCALE_ENTRY_H__ + G_BEGIN_DECLS #define GIMP_TYPE_SCALE_ENTRY (gimp_scale_entry_get_type ()) -G_DECLARE_DERIVABLE_TYPE (GimpScaleEntry, - gimp_scale_entry, - GIMP, SCALE_ENTRY, - GimpLabelSpin) - +G_DECLARE_DERIVABLE_TYPE (GimpScaleEntry, gimp_scale_entry, GIMP, SCALE_ENTRY, GimpLabelSpin) struct _GimpScaleEntryClass { GimpLabelSpinClass parent_class; /* Class methods */ - GtkWidget * (* new_range_widget) (GtkAdjustment *adjustment); + GtkWidget * (* new_range_widget) (GtkAdjustment *adjustment); /* Padding for future expansion */ void (* _gimp_reserved0) (void); @@ -58,22 +55,24 @@ struct _GimpScaleEntryClass void (* _gimp_reserved9) (void); }; +GtkWidget * gimp_scale_entry_new (const gchar *text, + gdouble value, + gdouble lower, + gdouble upper, + guint digits); -GtkWidget * gimp_scale_entry_new (const gchar *text, - gdouble value, - gdouble lower, - gdouble upper, - guint digits); +GtkWidget * gimp_scale_entry_get_range (GimpScaleEntry *entry); -GtkWidget * gimp_scale_entry_get_range (GimpScaleEntry *entry); +void gimp_scale_entry_set_bounds (GimpScaleEntry *entry, + gdouble lower, + gdouble upper, + gboolean limit_scale); -void gimp_scale_entry_set_bounds (GimpScaleEntry *entry, - gdouble lower, - gdouble upper, - gboolean limit_scale); +void gimp_scale_entry_set_logarithmic (GimpScaleEntry *entry, + gboolean logarithmic); +gboolean gimp_scale_entry_get_logarithmic (GimpScaleEntry *entry); -void gimp_scale_entry_set_logarithmic (GimpScaleEntry *entry, - gboolean logarithmic); -gboolean gimp_scale_entry_get_logarithmic (GimpScaleEntry *entry); G_END_DECLS + +#endif /* __GIMP_SCALE_ENTRY_H__ */ diff --git a/libgimpwidgets/gimpscrolledpreview.h b/libgimpwidgets/gimpscrolledpreview.h index 16696242d6..16a82c6ac6 100644 --- a/libgimpwidgets/gimpscrolledpreview.h +++ b/libgimpwidgets/gimpscrolledpreview.h @@ -18,16 +18,18 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_SCROLLED_PREVIEW_H__ +#define __GIMP_SCROLLED_PREVIEW_H__ + #include "gimppreview.h" G_BEGIN_DECLS + /* For information look into the C source or the html documentation */ @@ -74,4 +76,7 @@ void gimp_scroll_adjustment_values (GdkEventScroll *sevent, gdouble *hvalue, gdouble *vvalue); + G_END_DECLS + +#endif /* __GIMP_SCROLLED_PREVIEW_H__ */ diff --git a/libgimpwidgets/gimpsizeentry.h b/libgimpwidgets/gimpsizeentry.h index 658f42cdef..22419b8d64 100644 --- a/libgimpwidgets/gimpsizeentry.h +++ b/libgimpwidgets/gimpsizeentry.h @@ -20,12 +20,13 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_SIZE_ENTRY_H__ +#define __GIMP_SIZE_ENTRY_H__ + G_BEGIN_DECLS /* For information look into the C source or the html documentation */ @@ -111,5 +112,7 @@ void gimp_size_entry_set_activates_default (GimpSizeEntry *gse, GtkWidget * gimp_size_entry_get_help_widget (GimpSizeEntry *gse, gint field); + G_END_DECLS +#endif /* __GIMP_SIZE_ENTRY_H__ */ diff --git a/libgimpwidgets/gimpspinbutton.h b/libgimpwidgets/gimpspinbutton.h index a0bc57c5af..09ff8e54cf 100644 --- a/libgimpwidgets/gimpspinbutton.h +++ b/libgimpwidgets/gimpspinbutton.h @@ -19,22 +19,20 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_SPIN_BUTTON_H__ +#define __GIMP_SPIN_BUTTON_H__ + G_BEGIN_DECLS /* For information look into the C source or the html documentation */ #define GIMP_TYPE_SPIN_BUTTON (gimp_spin_button_get_type ()) -G_DECLARE_DERIVABLE_TYPE (GimpSpinButton, - gimp_spin_button, - GIMP, SPIN_BUTTON, - GtkSpinButton) +G_DECLARE_DERIVABLE_TYPE (GimpSpinButton, gimp_spin_button, GIMP, SPIN_BUTTON, GtkSpinButton) struct _GimpSpinButtonClass @@ -62,4 +60,7 @@ GtkWidget * gimp_spin_button_new_with_range (gdouble min, gdouble max, gdouble step); + G_END_DECLS + +#endif /* __GIMP_SPIN_BUTTON_H__ */ diff --git a/libgimpwidgets/gimpspinscale.h b/libgimpwidgets/gimpspinscale.h index e78b232076..01ba919e70 100644 --- a/libgimpwidgets/gimpspinscale.h +++ b/libgimpwidgets/gimpspinscale.h @@ -18,22 +18,20 @@ * along with this program. If not, see . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_SPIN_SCALE_H__ +#define __GIMP_SPIN_SCALE_H__ + #include G_BEGIN_DECLS #define GIMP_TYPE_SPIN_SCALE (gimp_spin_scale_get_type ()) -G_DECLARE_FINAL_TYPE (GimpSpinScale, - gimp_spin_scale, - GIMP, SPIN_SCALE, - GimpSpinButton) +G_DECLARE_FINAL_TYPE (GimpSpinScale, gimp_spin_scale, GIMP, SPIN_SCALE, GimpSpinButton) GtkWidget * gimp_spin_scale_new (GtkAdjustment *adjustment, @@ -63,3 +61,5 @@ gboolean gimp_spin_scale_get_constrain_drag (GimpSpinScale *scale); const guint gimp_spin_scale_get_mnemonic_keyval (GimpSpinScale *scale); G_END_DECLS + +#endif /* __GIMP_SPIN_SCALE_H__ */ diff --git a/libgimpwidgets/gimpstringcombobox.h b/libgimpwidgets/gimpstringcombobox.h index 8d7bb30d74..ec7abcf6cb 100644 --- a/libgimpwidgets/gimpstringcombobox.h +++ b/libgimpwidgets/gimpstringcombobox.h @@ -19,29 +19,27 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_STRING_COMBO_BOX_H__ +#define __GIMP_STRING_COMBO_BOX_H__ + G_BEGIN_DECLS + /** * GimpStringSensitivityFunc: * @id: the string value from the column @id_column as passed to [ctor@StringComboBox.new]. * @data: (closure): the data passed in [method@StringComboBox.set_sensitivity]. */ -typedef gboolean (* GimpStringSensitivityFunc) (const gchar *id, - gpointer data); +typedef gboolean (* GimpStringSensitivityFunc) (const gchar *id, + gpointer data); #define GIMP_TYPE_STRING_COMBO_BOX (gimp_string_combo_box_get_type ()) -G_DECLARE_DERIVABLE_TYPE (GimpStringComboBox, - gimp_string_combo_box, - GIMP, STRING_COMBO_BOX, - GtkComboBox) - +G_DECLARE_DERIVABLE_TYPE (GimpStringComboBox, gimp_string_combo_box, GIMP, STRING_COMBO_BOX, GtkComboBox) struct _GimpStringComboBoxClass { @@ -74,3 +72,5 @@ void gimp_string_combo_box_set_sensitivity (GimpStringComboBox *co GDestroyNotify destroy); G_END_DECLS + +#endif /* __GIMP_STRING_COMBO_BOX_H__ */ diff --git a/libgimpwidgets/gimpunitcombobox.h b/libgimpwidgets/gimpunitcombobox.h index 9a45b444f1..0f935a6ac0 100644 --- a/libgimpwidgets/gimpunitcombobox.h +++ b/libgimpwidgets/gimpunitcombobox.h @@ -19,19 +19,18 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_UNIT_COMBO_BOX_H__ +#define __GIMP_UNIT_COMBO_BOX_H__ + G_BEGIN_DECLS + #define GIMP_TYPE_UNIT_COMBO_BOX (gimp_unit_combo_box_get_type ()) -G_DECLARE_FINAL_TYPE (GimpUnitComboBox, - gimp_unit_combo_box, - GIMP, UNIT_COMBO_BOX, - GtkComboBox) +G_DECLARE_FINAL_TYPE (GimpUnitComboBox, gimp_unit_combo_box, GIMP, UNIT_COMBO_BOX, GtkComboBox) GtkWidget * gimp_unit_combo_box_new (void); @@ -41,4 +40,7 @@ GimpUnit * gimp_unit_combo_box_get_active (GimpUnitComboBox *combo); void gimp_unit_combo_box_set_active (GimpUnitComboBox *combo, GimpUnit *unit); + G_END_DECLS + +#endif /* __GIMP_UNIT_COMBO_BOX_H__ */ diff --git a/libgimpwidgets/gimpunitstore.h b/libgimpwidgets/gimpunitstore.h index a53c7e9a8c..d1a524f310 100644 --- a/libgimpwidgets/gimpunitstore.h +++ b/libgimpwidgets/gimpunitstore.h @@ -19,14 +19,16 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_UNIT_STORE_H__ +#define __GIMP_UNIT_STORE_H__ + G_BEGIN_DECLS + enum { GIMP_UNIT_STORE_UNIT, @@ -43,11 +45,7 @@ enum #define GIMP_TYPE_UNIT_STORE (gimp_unit_store_get_type ()) -G_DECLARE_DERIVABLE_TYPE (GimpUnitStore, - gimp_unit_store, - GIMP, UNIT_STORE, - GObject) - +G_DECLARE_DERIVABLE_TYPE (GimpUnitStore, gimp_unit_store, GIMP, UNIT_STORE, GObject) struct _GimpUnitStoreClass { @@ -99,4 +97,7 @@ void gimp_unit_store_get_values (GimpUnitStore *store, void _gimp_unit_store_sync_units (GimpUnitStore *store); + G_END_DECLS + +#endif /* __GIMP_UNIT_STORE_H__ */ diff --git a/libgimpwidgets/gimpwidgets-error.h b/libgimpwidgets/gimpwidgets-error.h index c6fbdef8ca..012fbb99d9 100644 --- a/libgimpwidgets/gimpwidgets-error.h +++ b/libgimpwidgets/gimpwidgets-error.h @@ -19,14 +19,16 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_WIDGETS_ERROR_H__ +#define __GIMP_WIDGETS_ERROR_H__ + G_BEGIN_DECLS + /** * GimpWidgetsError: * @GIMP_WIDGETS_PARSE_ERROR: A parse error has occurred @@ -50,4 +52,7 @@ typedef enum GQuark gimp_widgets_error_quark (void) G_GNUC_CONST; + G_END_DECLS + +#endif /* __GIMP_WIDGETS_ERROR_H__ */ diff --git a/libgimpwidgets/gimpwidgets-private.h b/libgimpwidgets/gimpwidgets-private.h index e3ddce65a5..22109c9a09 100644 --- a/libgimpwidgets/gimpwidgets-private.h +++ b/libgimpwidgets/gimpwidgets-private.h @@ -19,9 +19,9 @@ * . */ -#pragma once +#ifndef __GIMP_WIDGETS_PRIVATE_H__ +#define __GIMP_WIDGETS_PRIVATE_H__ -G_BEGIN_DECLS typedef GeglColor * (* GimpGetColorFunc) (void); typedef void (* GimpEnsureModulesFunc) (void); @@ -33,6 +33,9 @@ extern GimpGetColorFunc _gimp_get_background_func; extern GimpEnsureModulesFunc _gimp_ensure_modules_func; +G_BEGIN_DECLS + + void gimp_widgets_init (GimpHelpFunc standard_help_func, GimpGetColorFunc get_foreground_func, GimpGetColorFunc get_background_func, @@ -45,4 +48,7 @@ void gimp_widget_set_bound_property (GtkWidget *widget, GObject *config, const gchar *property_name); + G_END_DECLS + +#endif /* __GIMP_WIDGETS_PRIVATE_H__ */ diff --git a/libgimpwidgets/gimpwidgets.h b/libgimpwidgets/gimpwidgets.h index fb0a4fac2d..79a7487e37 100644 --- a/libgimpwidgets/gimpwidgets.h +++ b/libgimpwidgets/gimpwidgets.h @@ -19,7 +19,8 @@ * . */ -#pragma once +#ifndef __GIMP_WIDGETS_H__ +#define __GIMP_WIDGETS_H__ #define __GIMP_WIDGETS_H_INSIDE__ @@ -208,4 +209,7 @@ void gimp_float_adjustment_update (GtkAdjustment *adjustment, void gimp_double_adjustment_update (GtkAdjustment *adjustment, gpointer data); + G_END_DECLS + +#endif /* __GIMP_WIDGETS_H__ */ diff --git a/libgimpwidgets/gimpwidgetsenums.h b/libgimpwidgets/gimpwidgetsenums.h index a7e1e44fec..ef6d935607 100644 --- a/libgimpwidgets/gimpwidgetsenums.h +++ b/libgimpwidgets/gimpwidgetsenums.h @@ -16,7 +16,9 @@ * . */ -#pragma once +#ifndef __GIMP_WIDGETS_ENUMS_H__ +#define __GIMP_WIDGETS_ENUMS_H__ + G_BEGIN_DECLS @@ -235,4 +237,7 @@ typedef enum GIMP_ZOOM_PINCH, /*< skip >*/ } GimpZoomType; + G_END_DECLS + +#endif /* __GIMP_WIDGETS_ENUMS_H__ */ diff --git a/libgimpwidgets/gimpwidgetstypes.h b/libgimpwidgets/gimpwidgetstypes.h index ae045122d7..9fad1b98bf 100644 --- a/libgimpwidgets/gimpwidgetstypes.h +++ b/libgimpwidgets/gimpwidgetstypes.h @@ -18,7 +18,8 @@ * . */ -#pragma once +#ifndef __GIMP_WIDGETS_TYPES_H__ +#define __GIMP_WIDGETS_TYPES_H__ #include @@ -109,4 +110,7 @@ typedef struct _GimpZoomModel GimpZoomModel; typedef void (* GimpHelpFunc) (const gchar *help_id, gpointer help_data); + G_END_DECLS + +#endif /* __GIMP_WIDGETS_TYPES_H__ */ diff --git a/libgimpwidgets/gimpwidgetsutils.h b/libgimpwidgets/gimpwidgetsutils.h index ea29d7f60d..6e3d945409 100644 --- a/libgimpwidgets/gimpwidgetsutils.h +++ b/libgimpwidgets/gimpwidgetsutils.h @@ -18,12 +18,13 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_WIDGETS_UTILS_H__ +#define __GIMP_WIDGETS_UTILS_H__ + G_BEGIN_DECLS /* For information look into the C source or the html documentation */ @@ -80,4 +81,7 @@ G_GNUC_INTERNAL void _gimp_widget_get_profiles (GtkWidget *widget, GimpColorProfile **proof_profile, GimpColorProfile **dest_profile); + G_END_DECLS + +#endif /* __GIMP_WIDGETS_UTILS_H__ */ diff --git a/libgimpwidgets/gimpzoommodel.h b/libgimpwidgets/gimpzoommodel.h index 3e2b30fdb9..4365eb724b 100644 --- a/libgimpwidgets/gimpzoommodel.h +++ b/libgimpwidgets/gimpzoommodel.h @@ -19,19 +19,18 @@ * . */ -#pragma once - #if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) #error "Only can be included directly." #endif +#ifndef __GIMP_ZOOM_MODEL_H__ +#define __GIMP_ZOOM_MODEL_H__ + G_BEGIN_DECLS + #define GIMP_TYPE_ZOOM_MODEL (gimp_zoom_model_get_type ()) -G_DECLARE_FINAL_TYPE (GimpZoomModel, - gimp_zoom_model, - GIMP, ZOOM_MODEL, - GObject) +G_DECLARE_FINAL_TYPE (GimpZoomModel, gimp_zoom_model, GIMP, ZOOM_MODEL, GObject) GimpZoomModel * gimp_zoom_model_new (void); @@ -55,3 +54,5 @@ gdouble gimp_zoom_model_zoom_step (GimpZoomType zoom_type, gdouble delta); G_END_DECLS + +#endif /* __GIMP_ZOOM_MODEL_H__ */