summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog12
-rw-r--r--ChangeLog.pre-2-1012
-rw-r--r--ChangeLog.pre-2-412
-rw-r--r--ChangeLog.pre-2-612
-rw-r--r--ChangeLog.pre-2-812
-rw-r--r--gtk/gtkaction.h3
-rw-r--r--gtk/gtkactiongroup.h3
-rw-r--r--gtk/gtkradioaction.h4
-rw-r--r--gtk/gtkradiotoolbutton.h4
-rw-r--r--gtk/gtkseparatortoolitem.h4
-rw-r--r--gtk/gtktoggleaction.h3
-rw-r--r--gtk/gtktoolitem.h3
-rw-r--r--gtk/gtkuimanager.h4
13 files changed, 86 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 67208be49a..80444b3eff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
* gtk/gtkentry.c (gtk_entry_set_text): Check if completion is
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 67208be49a..80444b3eff 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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>
* gtk/gtkentry.c (gtk_entry_set_text): Check if completion is
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 67208be49a..80444b3eff 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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>
* gtk/gtkentry.c (gtk_entry_set_text): Check if completion is
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 67208be49a..80444b3eff 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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>
* gtk/gtkentry.c (gtk_entry_set_text): Check if completion is
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 67208be49a..80444b3eff 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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>
* gtk/gtkentry.c (gtk_entry_set_text): Check if completion is
diff --git a/gtk/gtkaction.h b/gtk/gtkaction.h
index 8832298360..df0464e277 100644
--- a/gtk/gtkaction.h
+++ b/gtk/gtkaction.h
@@ -33,6 +33,8 @@
#include <gtk/gtkwidget.h>
#include <glib-object.h>
+G_BEGIN_DECLS
+
#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_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,
GtkAccelGroup *accel_group);
+G_END_DECLS
#endif /* __GTK_ACTION_H__ */
diff --git a/gtk/gtkactiongroup.h b/gtk/gtkactiongroup.h
index 22d99f48dc..7d8b4be203 100644
--- a/gtk/gtkactiongroup.h
+++ b/gtk/gtkactiongroup.h
@@ -33,6 +33,8 @@
#include <gtk/gtkaction.h>
#include <gtk/gtkitemfactory.h> /* for GtkTranslateFunc */
+G_BEGIN_DECLS
+
#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_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,
const gchar *domain);
+G_END_DECLS
#endif /* __GTK_ACTION_GROUP_H__ */
diff --git a/gtk/gtkradioaction.h b/gtk/gtkradioaction.h
index bfeba215e4..3617a239b2 100644
--- a/gtk/gtkradioaction.h
+++ b/gtk/gtkradioaction.h
@@ -32,6 +32,8 @@
#include <gtk/gtktoggleaction.h>
+G_BEGIN_DECLS
+
#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_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);
gint gtk_radio_action_get_current_value (GtkRadioAction *action);
+G_END_DECLS
+
#endif /* __GTK_RADIO_ACTION_H__ */
diff --git a/gtk/gtkradiotoolbutton.h b/gtk/gtkradiotoolbutton.h
index 1d0ffdc23c..479268dde5 100644
--- a/gtk/gtkradiotoolbutton.h
+++ b/gtk/gtkradiotoolbutton.h
@@ -25,6 +25,8 @@
#include "gtktoggletoolbutton.h"
+G_BEGIN_DECLS
+
#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_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,
GSList *group);
-
+G_END_DECLS
#endif /* __GTK_RADIO_TOOL_BUTTON_H__ */
diff --git a/gtk/gtkseparatortoolitem.h b/gtk/gtkseparatortoolitem.h
index 10daa20436..952d1f9a8d 100644
--- a/gtk/gtkseparatortoolitem.h
+++ b/gtk/gtkseparatortoolitem.h
@@ -24,6 +24,8 @@
#include "gtktoolitem.h"
+G_BEGIN_DECLS
+
#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_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;
GtkToolItem *gtk_separator_tool_item_new (void);
+G_END_DECLS
+
#endif /* __GTK_SEPARATOR_TOOL_ITEM_H__ */
diff --git a/gtk/gtktoggleaction.h b/gtk/gtktoggleaction.h
index b4e20f48c2..0b7b4180c7 100644
--- a/gtk/gtktoggleaction.h
+++ b/gtk/gtktoggleaction.h
@@ -32,6 +32,8 @@
#include <gtk/gtkaction.h>
+G_BEGIN_DECLS
+
#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_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 gtk_toggle_action_get_draw_as_radio (GtkToggleAction *action);
+G_END_DECLS
#endif /* __GTK_TOGGLE_ACTION_H__ */
diff --git a/gtk/gtktoolitem.h b/gtk/gtktoolitem.h
index 9d9b34ecc2..d5a6f8c225 100644
--- a/gtk/gtktoolitem.h
+++ b/gtk/gtktoolitem.h
@@ -27,6 +27,8 @@
#include <gtk/gtktooltips.h>
#include <gtk/gtkmenuitem.h>
+G_BEGIN_DECLS
+
#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_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 */
void _gtk_tool_item_toolbar_reconfigured (GtkToolItem *tool_item);
+G_END_DECLS
#endif /* __GTK_TOOL_ITEM_H__ */
diff --git a/gtk/gtkuimanager.h b/gtk/gtkuimanager.h
index ee9013f063..d6f2c6a6e3 100644
--- a/gtk/gtkuimanager.h
+++ b/gtk/gtkuimanager.h
@@ -38,6 +38,8 @@
#include <gtk/gtkaction.h>
#include <gtk/gtkactiongroup.h>
+G_BEGIN_DECLS
+
#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_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);
guint gtk_ui_manager_new_merge_id (GtkUIManager *self);
-
+G_END_DECLS
#endif /* __GTK_UI_MANAGER_H__ */
View Lorry Controller Status