Add G_BEGIN_DECLS/G_END_DECLS to make these usable in C++. (#124351,

Sat Oct 11 23:14:36 2003  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkactiongroup.h:
	* gtk/gtkaction.h:
	* gtk/gtkradioaction.h:
	* gtk/gtkradiotoolbutton.h:
	* gtk/gtkseparatortoolitem.h:
	* gtk/gtktoggleaction.h:
	* gtk/gtktoolitem.h:
	* gtk/gtkuimanager.h: Add G_BEGIN_DECLS/G_END_DECLS to make
	these usable in C++.  (#124351, Murray Cumming)
This commit is contained in:
Matthias Clasen 2003-10-11 21:24:10 +00:00 committed by Matthias Clasen
parent 407e957c04
commit c44e5b00e0
13 changed files with 86 additions and 2 deletions

View File

@ -1,3 +1,15 @@
Sat Oct 11 23:14:36 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkactiongroup.h:
* gtk/gtkaction.h:
* gtk/gtkradioaction.h:
* gtk/gtkradiotoolbutton.h:
* gtk/gtkseparatortoolitem.h:
* gtk/gtktoggleaction.h:
* gtk/gtktoolitem.h:
* gtk/gtkuimanager.h: Add G_BEGIN_DECLS/G_END_DECLS to make
these usable in C++. (#124351, Murray Cumming)
Sat Oct 11 19:09:05 2003 Kristian Rietveld <kris@gtk.org> Sat Oct 11 19:09:05 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_set_text): Check if completion is * gtk/gtkentry.c (gtk_entry_set_text): Check if completion is

View File

@ -1,3 +1,15 @@
Sat Oct 11 23:14:36 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkactiongroup.h:
* gtk/gtkaction.h:
* gtk/gtkradioaction.h:
* gtk/gtkradiotoolbutton.h:
* gtk/gtkseparatortoolitem.h:
* gtk/gtktoggleaction.h:
* gtk/gtktoolitem.h:
* gtk/gtkuimanager.h: Add G_BEGIN_DECLS/G_END_DECLS to make
these usable in C++. (#124351, Murray Cumming)
Sat Oct 11 19:09:05 2003 Kristian Rietveld <kris@gtk.org> Sat Oct 11 19:09:05 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_set_text): Check if completion is * gtk/gtkentry.c (gtk_entry_set_text): Check if completion is

View File

@ -1,3 +1,15 @@
Sat Oct 11 23:14:36 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkactiongroup.h:
* gtk/gtkaction.h:
* gtk/gtkradioaction.h:
* gtk/gtkradiotoolbutton.h:
* gtk/gtkseparatortoolitem.h:
* gtk/gtktoggleaction.h:
* gtk/gtktoolitem.h:
* gtk/gtkuimanager.h: Add G_BEGIN_DECLS/G_END_DECLS to make
these usable in C++. (#124351, Murray Cumming)
Sat Oct 11 19:09:05 2003 Kristian Rietveld <kris@gtk.org> Sat Oct 11 19:09:05 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_set_text): Check if completion is * gtk/gtkentry.c (gtk_entry_set_text): Check if completion is

View File

@ -1,3 +1,15 @@
Sat Oct 11 23:14:36 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkactiongroup.h:
* gtk/gtkaction.h:
* gtk/gtkradioaction.h:
* gtk/gtkradiotoolbutton.h:
* gtk/gtkseparatortoolitem.h:
* gtk/gtktoggleaction.h:
* gtk/gtktoolitem.h:
* gtk/gtkuimanager.h: Add G_BEGIN_DECLS/G_END_DECLS to make
these usable in C++. (#124351, Murray Cumming)
Sat Oct 11 19:09:05 2003 Kristian Rietveld <kris@gtk.org> Sat Oct 11 19:09:05 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_set_text): Check if completion is * gtk/gtkentry.c (gtk_entry_set_text): Check if completion is

View File

@ -1,3 +1,15 @@
Sat Oct 11 23:14:36 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkactiongroup.h:
* gtk/gtkaction.h:
* gtk/gtkradioaction.h:
* gtk/gtkradiotoolbutton.h:
* gtk/gtkseparatortoolitem.h:
* gtk/gtktoggleaction.h:
* gtk/gtktoolitem.h:
* gtk/gtkuimanager.h: Add G_BEGIN_DECLS/G_END_DECLS to make
these usable in C++. (#124351, Murray Cumming)
Sat Oct 11 19:09:05 2003 Kristian Rietveld <kris@gtk.org> Sat Oct 11 19:09:05 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_set_text): Check if completion is * gtk/gtkentry.c (gtk_entry_set_text): Check if completion is

View File

@ -33,6 +33,8 @@
#include <gtk/gtkwidget.h> #include <gtk/gtkwidget.h>
#include <glib-object.h> #include <glib-object.h>
G_BEGIN_DECLS
#define GTK_TYPE_ACTION (gtk_action_get_type ()) #define GTK_TYPE_ACTION (gtk_action_get_type ())
#define GTK_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ACTION, GtkAction)) #define GTK_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ACTION, GtkAction))
#define GTK_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ACTION, GtkActionClass)) #define GTK_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ACTION, GtkActionClass))
@ -105,5 +107,6 @@ void gtk_action_set_accel_path (GtkAction *action,
void gtk_action_set_accel_group (GtkAction *action, void gtk_action_set_accel_group (GtkAction *action,
GtkAccelGroup *accel_group); GtkAccelGroup *accel_group);
G_END_DECLS
#endif /* __GTK_ACTION_H__ */ #endif /* __GTK_ACTION_H__ */

View File

@ -33,6 +33,8 @@
#include <gtk/gtkaction.h> #include <gtk/gtkaction.h>
#include <gtk/gtkitemfactory.h> /* for GtkTranslateFunc */ #include <gtk/gtkitemfactory.h> /* for GtkTranslateFunc */
G_BEGIN_DECLS
#define GTK_TYPE_ACTION_GROUP (gtk_action_group_get_type ()) #define GTK_TYPE_ACTION_GROUP (gtk_action_group_get_type ())
#define GTK_ACTION_GROUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ACTION_GROUP, GtkActionGroup)) #define GTK_ACTION_GROUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ACTION_GROUP, GtkActionGroup))
#define GTK_ACTION_GROUP_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_TYPE_ACTION_GROUP, GtkActionGroupClass)) #define GTK_ACTION_GROUP_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_TYPE_ACTION_GROUP, GtkActionGroupClass))
@ -149,5 +151,6 @@ void gtk_action_group_set_translate_func (GtkActionGroup *
void gtk_action_group_set_translation_domain (GtkActionGroup *action_group, void gtk_action_group_set_translation_domain (GtkActionGroup *action_group,
const gchar *domain); const gchar *domain);
G_END_DECLS
#endif /* __GTK_ACTION_GROUP_H__ */ #endif /* __GTK_ACTION_GROUP_H__ */

View File

@ -32,6 +32,8 @@
#include <gtk/gtktoggleaction.h> #include <gtk/gtktoggleaction.h>
G_BEGIN_DECLS
#define GTK_TYPE_RADIO_ACTION (gtk_radio_action_get_type ()) #define GTK_TYPE_RADIO_ACTION (gtk_radio_action_get_type ())
#define GTK_RADIO_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_ACTION, GtkRadioAction)) #define GTK_RADIO_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_ACTION, GtkRadioAction))
#define GTK_RADIO_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_ACTION, GtkRadioActionClass)) #define GTK_RADIO_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_ACTION, GtkRadioActionClass))
@ -72,4 +74,6 @@ void gtk_radio_action_set_group (GtkRadioAction *action,
GSList *group); GSList *group);
gint gtk_radio_action_get_current_value (GtkRadioAction *action); gint gtk_radio_action_get_current_value (GtkRadioAction *action);
G_END_DECLS
#endif /* __GTK_RADIO_ACTION_H__ */ #endif /* __GTK_RADIO_ACTION_H__ */

View File

@ -25,6 +25,8 @@
#include "gtktoggletoolbutton.h" #include "gtktoggletoolbutton.h"
G_BEGIN_DECLS
#define GTK_TYPE_RADIO_TOOL_BUTTON (gtk_radio_tool_button_get_type ()) #define GTK_TYPE_RADIO_TOOL_BUTTON (gtk_radio_tool_button_get_type ())
#define GTK_RADIO_TOOL_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_TOOL_BUTTON, GtkRadioToolButton)) #define GTK_RADIO_TOOL_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_TOOL_BUTTON, GtkRadioToolButton))
#define GTK_RADIO_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_TOOL_BUTTON, GtkRadioToolButtonClass)) #define GTK_RADIO_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_TOOL_BUTTON, GtkRadioToolButtonClass))
@ -63,6 +65,6 @@ GSList * gtk_radio_tool_button_get_group (GtkRadioToolButto
void gtk_radio_tool_button_set_group (GtkRadioToolButton *button, void gtk_radio_tool_button_set_group (GtkRadioToolButton *button,
GSList *group); GSList *group);
G_END_DECLS
#endif /* __GTK_RADIO_TOOL_BUTTON_H__ */ #endif /* __GTK_RADIO_TOOL_BUTTON_H__ */

View File

@ -24,6 +24,8 @@
#include "gtktoolitem.h" #include "gtktoolitem.h"
G_BEGIN_DECLS
#define GTK_TYPE_SEPARATOR_TOOL_ITEM (gtk_separator_tool_item_get_type ()) #define GTK_TYPE_SEPARATOR_TOOL_ITEM (gtk_separator_tool_item_get_type ())
#define GTK_SEPARATOR_TOOL_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SEPARATOR_TOOL_ITEM, GtkSeparatorToolItem)) #define GTK_SEPARATOR_TOOL_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SEPARATOR_TOOL_ITEM, GtkSeparatorToolItem))
#define GTK_SEPARATOR_TOOL_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SEPARATOR_TOOL_ITEM, GtkSeparatorToolItemClass)) #define GTK_SEPARATOR_TOOL_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SEPARATOR_TOOL_ITEM, GtkSeparatorToolItemClass))
@ -53,4 +55,6 @@ struct _GtkSeparatorToolItemClass
GType gtk_separator_tool_item_get_type (void) G_GNUC_CONST; GType gtk_separator_tool_item_get_type (void) G_GNUC_CONST;
GtkToolItem *gtk_separator_tool_item_new (void); GtkToolItem *gtk_separator_tool_item_new (void);
G_END_DECLS
#endif /* __GTK_SEPARATOR_TOOL_ITEM_H__ */ #endif /* __GTK_SEPARATOR_TOOL_ITEM_H__ */

View File

@ -32,6 +32,8 @@
#include <gtk/gtkaction.h> #include <gtk/gtkaction.h>
G_BEGIN_DECLS
#define GTK_TYPE_TOGGLE_ACTION (gtk_toggle_action_get_type ()) #define GTK_TYPE_TOGGLE_ACTION (gtk_toggle_action_get_type ())
#define GTK_TOGGLE_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOGGLE_ACTION, GtkToggleAction)) #define GTK_TOGGLE_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOGGLE_ACTION, GtkToggleAction))
#define GTK_TOGGLE_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOGGLE_ACTION, GtkToggleActionClass)) #define GTK_TOGGLE_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOGGLE_ACTION, GtkToggleActionClass))
@ -74,5 +76,6 @@ void gtk_toggle_action_set_draw_as_radio (GtkToggleAction *action,
gboolean draw_as_radio); gboolean draw_as_radio);
gboolean gtk_toggle_action_get_draw_as_radio (GtkToggleAction *action); gboolean gtk_toggle_action_get_draw_as_radio (GtkToggleAction *action);
G_END_DECLS
#endif /* __GTK_TOGGLE_ACTION_H__ */ #endif /* __GTK_TOGGLE_ACTION_H__ */

View File

@ -27,6 +27,8 @@
#include <gtk/gtktooltips.h> #include <gtk/gtktooltips.h>
#include <gtk/gtkmenuitem.h> #include <gtk/gtkmenuitem.h>
G_BEGIN_DECLS
#define GTK_TYPE_TOOL_ITEM (gtk_tool_item_get_type ()) #define GTK_TYPE_TOOL_ITEM (gtk_tool_item_get_type ())
#define GTK_TOOL_ITEM(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_TOOL_ITEM, GtkToolItem)) #define GTK_TOOL_ITEM(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_TOOL_ITEM, GtkToolItem))
#define GTK_TOOL_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOOL_ITEM, GtkToolItemClass)) #define GTK_TOOL_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOOL_ITEM, GtkToolItemClass))
@ -116,5 +118,6 @@ void gtk_tool_item_set_proxy_menu_item (GtkToolItem *tool_item,
/* internal function */ /* internal function */
void _gtk_tool_item_toolbar_reconfigured (GtkToolItem *tool_item); void _gtk_tool_item_toolbar_reconfigured (GtkToolItem *tool_item);
G_END_DECLS
#endif /* __GTK_TOOL_ITEM_H__ */ #endif /* __GTK_TOOL_ITEM_H__ */

View File

@ -38,6 +38,8 @@
#include <gtk/gtkaction.h> #include <gtk/gtkaction.h>
#include <gtk/gtkactiongroup.h> #include <gtk/gtkactiongroup.h>
G_BEGIN_DECLS
#define GTK_TYPE_UI_MANAGER (gtk_ui_manager_get_type ()) #define GTK_TYPE_UI_MANAGER (gtk_ui_manager_get_type ())
#define GTK_UI_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_UI_MANAGER, GtkUIManager)) #define GTK_UI_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_UI_MANAGER, GtkUIManager))
#define GTK_UI_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_UI_MANAGER, GtkUIManagerClass)) #define GTK_UI_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_UI_MANAGER, GtkUIManagerClass))
@ -121,6 +123,6 @@ gchar *gtk_ui_manager_get_ui (GtkUIManager *self);
void gtk_ui_manager_ensure_update (GtkUIManager *self); void gtk_ui_manager_ensure_update (GtkUIManager *self);
guint gtk_ui_manager_new_merge_id (GtkUIManager *self); guint gtk_ui_manager_new_merge_id (GtkUIManager *self);
G_END_DECLS
#endif /* __GTK_UI_MANAGER_H__ */ #endif /* __GTK_UI_MANAGER_H__ */