From 99b14ff2c5a97bd468859a06402828d52a6fb3ee Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 17 Nov 2000 22:30:47 +0000 Subject: [PATCH] Update. 2000-11-18 Tor Lillqvist * gtk/gtk.def: Update. * gtk/gtktexttypes.h: Mark variables for export/import from DLL. --- ChangeLog | 4 +++- ChangeLog.pre-2-0 | 4 +++- ChangeLog.pre-2-10 | 4 +++- ChangeLog.pre-2-2 | 4 +++- ChangeLog.pre-2-4 | 4 +++- ChangeLog.pre-2-6 | 4 +++- ChangeLog.pre-2-8 | 4 +++- gtk/gtk.def | 8 ++++++++ gtk/gtktexttypes.h | 26 ++++++++++++++++++-------- 9 files changed, 47 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index fccaac46e..53d4a6670 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2000-11-17 Tor Lillqvist +2000-11-18 Tor Lillqvist * gdk/gdkevents.h: Add comment that GdkXEvent isn't only for XEvent, but in general for window system specific events. @@ -7,6 +7,8 @@ * gtk/makefile.mingw.in * gtk/makefile.msc.in: Update. + * gtk/gtktexttypes.h: Mark variables for export/import from DLL. + Thu Nov 16 16:11:39 2000 Owen Taylor * gtk/Makefile.am (EXTRA_DIST): Do not, in any circumstances, diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index fccaac46e..53d4a6670 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,4 +1,4 @@ -2000-11-17 Tor Lillqvist +2000-11-18 Tor Lillqvist * gdk/gdkevents.h: Add comment that GdkXEvent isn't only for XEvent, but in general for window system specific events. @@ -7,6 +7,8 @@ * gtk/makefile.mingw.in * gtk/makefile.msc.in: Update. + * gtk/gtktexttypes.h: Mark variables for export/import from DLL. + Thu Nov 16 16:11:39 2000 Owen Taylor * gtk/Makefile.am (EXTRA_DIST): Do not, in any circumstances, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fccaac46e..53d4a6670 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,4 +1,4 @@ -2000-11-17 Tor Lillqvist +2000-11-18 Tor Lillqvist * gdk/gdkevents.h: Add comment that GdkXEvent isn't only for XEvent, but in general for window system specific events. @@ -7,6 +7,8 @@ * gtk/makefile.mingw.in * gtk/makefile.msc.in: Update. + * gtk/gtktexttypes.h: Mark variables for export/import from DLL. + Thu Nov 16 16:11:39 2000 Owen Taylor * gtk/Makefile.am (EXTRA_DIST): Do not, in any circumstances, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index fccaac46e..53d4a6670 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,4 +1,4 @@ -2000-11-17 Tor Lillqvist +2000-11-18 Tor Lillqvist * gdk/gdkevents.h: Add comment that GdkXEvent isn't only for XEvent, but in general for window system specific events. @@ -7,6 +7,8 @@ * gtk/makefile.mingw.in * gtk/makefile.msc.in: Update. + * gtk/gtktexttypes.h: Mark variables for export/import from DLL. + Thu Nov 16 16:11:39 2000 Owen Taylor * gtk/Makefile.am (EXTRA_DIST): Do not, in any circumstances, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index fccaac46e..53d4a6670 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,4 +1,4 @@ -2000-11-17 Tor Lillqvist +2000-11-18 Tor Lillqvist * gdk/gdkevents.h: Add comment that GdkXEvent isn't only for XEvent, but in general for window system specific events. @@ -7,6 +7,8 @@ * gtk/makefile.mingw.in * gtk/makefile.msc.in: Update. + * gtk/gtktexttypes.h: Mark variables for export/import from DLL. + Thu Nov 16 16:11:39 2000 Owen Taylor * gtk/Makefile.am (EXTRA_DIST): Do not, in any circumstances, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fccaac46e..53d4a6670 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,4 +1,4 @@ -2000-11-17 Tor Lillqvist +2000-11-18 Tor Lillqvist * gdk/gdkevents.h: Add comment that GdkXEvent isn't only for XEvent, but in general for window system specific events. @@ -7,6 +7,8 @@ * gtk/makefile.mingw.in * gtk/makefile.msc.in: Update. + * gtk/gtktexttypes.h: Mark variables for export/import from DLL. + Thu Nov 16 16:11:39 2000 Owen Taylor * gtk/Makefile.am (EXTRA_DIST): Do not, in any circumstances, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fccaac46e..53d4a6670 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,4 +1,4 @@ -2000-11-17 Tor Lillqvist +2000-11-18 Tor Lillqvist * gdk/gdkevents.h: Add comment that GdkXEvent isn't only for XEvent, but in general for window system specific events. @@ -7,6 +7,8 @@ * gtk/makefile.mingw.in * gtk/makefile.msc.in: Update. + * gtk/gtktexttypes.h: Mark variables for export/import from DLL. + Thu Nov 16 16:11:39 2000 Owen Taylor * gtk/Makefile.am (EXTRA_DIST): Do not, in any circumstances, diff --git a/gtk/gtk.def b/gtk/gtk.def index 420d732c0..77d276671 100755 --- a/gtk/gtk.def +++ b/gtk/gtk.def @@ -1178,6 +1178,9 @@ EXPORTS gtk_text_buffer_remove_tag gtk_text_buffer_remove_tag_by_name gtk_text_buffer_set_modified + gtk_text_byte_begins_utf8_char + gtk_text_char_type + gtk_text_child_type gtk_text_forward_delete gtk_text_freeze gtk_text_get_length @@ -1209,7 +1212,10 @@ EXPORTS gtk_text_iter_reorder gtk_text_iter_spew gtk_text_iter_toggles_tag + gtk_text_left_mark_type gtk_text_new + gtk_text_pixbuf_type + gtk_text_right_mark_type gtk_text_set_adjustments gtk_text_set_editable gtk_text_set_line_wrap @@ -1217,6 +1223,8 @@ EXPORTS gtk_text_set_word_wrap gtk_text_tag_get_type gtk_text_tag_table_lookup + gtk_text_toggle_off_type + gtk_text_toggle_on_type gtk_text_thaw gtk_text_unknown_char_utf8 gtk_text_view_buffer_to_window_coords diff --git a/gtk/gtktexttypes.h b/gtk/gtktexttypes.h index f58fd45e3..76f7287f0 100644 --- a/gtk/gtktexttypes.h +++ b/gtk/gtktexttypes.h @@ -21,25 +21,35 @@ typedef struct _GtkTextMarkBody GtkTextMarkBody; * Declarations for variables shared among the text-related files: */ +#ifdef G_OS_WIN32 +#ifdef GTK_COMPILATION +#define VARIABLE __declspec(dllexport) +#else +#define VARIABLE __declspec(dllimport) extern +#endif +#else +#define VARIABLE extern +#endif + /* In gtktextbtree.c */ -extern GtkTextLineSegmentClass gtk_text_char_type; -extern GtkTextLineSegmentClass gtk_text_toggle_on_type; -extern GtkTextLineSegmentClass gtk_text_toggle_off_type; +VARIABLE GtkTextLineSegmentClass gtk_text_char_type; +VARIABLE GtkTextLineSegmentClass gtk_text_toggle_on_type; +VARIABLE GtkTextLineSegmentClass gtk_text_toggle_off_type; /* In gtktextmark.c */ -extern GtkTextLineSegmentClass gtk_text_left_mark_type; -extern GtkTextLineSegmentClass gtk_text_right_mark_type; +VARIABLE GtkTextLineSegmentClass gtk_text_left_mark_type; +VARIABLE GtkTextLineSegmentClass gtk_text_right_mark_type; /* In gtktextchild.c */ -extern GtkTextLineSegmentClass gtk_text_pixbuf_type; -extern GtkTextLineSegmentClass gtk_text_child_type; +VARIABLE GtkTextLineSegmentClass gtk_text_pixbuf_type; +VARIABLE GtkTextLineSegmentClass gtk_text_child_type; /* * UTF 8 Stubs */ #define GTK_TEXT_UNKNOWN_CHAR 0xFFFC -extern const gchar gtk_text_unknown_char_utf8[]; +VARIABLE const gchar gtk_text_unknown_char_utf8[]; gboolean gtk_text_byte_begins_utf8_char (const gchar *byte); -- 2.43.2