mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-10 02:40:11 +00:00
Make GtkPlug/Socket API available on all platforms.
2005-07-21 Tor Lillqvist <tml@novell.com> * gtk/gtk.symbols: Make GtkPlug/Socket API available on all platforms. * gtk/Makefile.am: Changes to build GtkPlug/Socket on all platforms.
This commit is contained in:
parent
6a7be726dd
commit
860ab51af9
@ -1,5 +1,9 @@
|
||||
2005-07-21 Tor Lillqvist <tml@novell.com>
|
||||
|
||||
* gtk/gtk.symbols: Make GtkPlug/Socket API available on all platforms.
|
||||
|
||||
* gtk/Makefile.am: Changes to build GtkPlug/Socket on all platforms.
|
||||
|
||||
* gtk/gtksocket.c
|
||||
* gtk/gtkplug.c: Splice out backend-dependend parts to separate
|
||||
files, see below.
|
||||
|
@ -1,5 +1,9 @@
|
||||
2005-07-21 Tor Lillqvist <tml@novell.com>
|
||||
|
||||
* gtk/gtk.symbols: Make GtkPlug/Socket API available on all platforms.
|
||||
|
||||
* gtk/Makefile.am: Changes to build GtkPlug/Socket on all platforms.
|
||||
|
||||
* gtk/gtksocket.c
|
||||
* gtk/gtkplug.c: Splice out backend-dependend parts to separate
|
||||
files, see below.
|
||||
|
@ -1,5 +1,9 @@
|
||||
2005-07-21 Tor Lillqvist <tml@novell.com>
|
||||
|
||||
* gtk/gtk.symbols: Make GtkPlug/Socket API available on all platforms.
|
||||
|
||||
* gtk/Makefile.am: Changes to build GtkPlug/Socket on all platforms.
|
||||
|
||||
* gtk/gtksocket.c
|
||||
* gtk/gtkplug.c: Splice out backend-dependend parts to separate
|
||||
files, see below.
|
||||
|
@ -303,8 +303,10 @@ gtk_private_h_sources = \
|
||||
gtkfilesystemmodel.h \
|
||||
gtkiconcache.h \
|
||||
gtkpathbar.h \
|
||||
gtkplugprivate.h \
|
||||
gtkrbtree.h \
|
||||
gtksequence.h \
|
||||
gtksocketprivate.h \
|
||||
gtktextbtree.h \
|
||||
gtktextchildprivate.h \
|
||||
gtktextsegment.h \
|
||||
@ -439,6 +441,7 @@ gtk_c_sources = \
|
||||
gtkpaned.c \
|
||||
gtkpathbar.c \
|
||||
gtkpixmap.c \
|
||||
gtkplug.c \
|
||||
gtkpreview.c \
|
||||
gtkprogress.c \
|
||||
gtkprogressbar.c \
|
||||
@ -461,6 +464,7 @@ gtk_c_sources = \
|
||||
gtksettings.c \
|
||||
gtksignal.c \
|
||||
gtksizegroup.c \
|
||||
gtksocket.c \
|
||||
gtkspinbutton.c \
|
||||
gtkstatusbar.c \
|
||||
gtkstock.c \
|
||||
@ -530,11 +534,17 @@ gtk_private_h_sources += gtkfilesystemwin32.h
|
||||
gtk_c_sources += gtkfilesystemwin32.c
|
||||
endif
|
||||
|
||||
gtk_plug_c_sources = \
|
||||
gtkplug.c \
|
||||
gtksocket.c \
|
||||
gtkxembed.c \
|
||||
gtkxembed.h
|
||||
if USE_X11
|
||||
gtk_private_h_sources += gtkxembed.h
|
||||
gtk_c_sources += gtkplug-x11.c gtksocket-x11.c gtkxembed.c
|
||||
else
|
||||
if USE_WIN32
|
||||
gtk_private_h_sources += gtkwin32embed.h
|
||||
gtk_c_sources += gtkplug-win32.c gtksocket-win32.c gtkwin32embed.c
|
||||
else
|
||||
gtk_c_sources += gtkplug-stub.c gtksocket-stub.c
|
||||
endif
|
||||
endif
|
||||
|
||||
# we use our own built_sources variable rules to avoid automake's
|
||||
# BUILT_SOURCES oddities
|
||||
@ -653,7 +663,7 @@ lib_LTLIBRARIES = $(gtktargetlib)
|
||||
gtkincludedir = $(includedir)/gtk-2.0/gtk
|
||||
gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h
|
||||
|
||||
libgtk_x11_2_0_la_SOURCES = $(gtk_c_sources) $(gtk_plug_c_sources)
|
||||
libgtk_x11_2_0_la_SOURCES = $(gtk_c_sources)
|
||||
libgtk_linux_fb_2_0_la_SOURCES = $(gtk_c_sources)
|
||||
libgtk_win32_2_0_la_SOURCES = $(gtk_c_sources)
|
||||
|
||||
@ -663,7 +673,7 @@ libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts)
|
||||
|
||||
libgtk_x11_2_0_la_LIBADD = $(libadd)
|
||||
libgtk_linux_fb_2_0_la_LIBADD = $(libadd)
|
||||
libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32
|
||||
libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32
|
||||
libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res)
|
||||
|
||||
if USE_WIN32
|
||||
|
@ -1,11 +1,13 @@
|
||||
/* This list defines the GTK+ ABI. It is used to generate the gtk.def
|
||||
* file and the gtkalias.h header.
|
||||
*
|
||||
* Variables must be put into ifdef INCLUDE_VARIABLES ... endif sections.
|
||||
* Internal symbols (ie those in gtkinternals.h) must be protected by
|
||||
* ifdef INCLUDE_INTERNAL_SYMBOLS. Symbols which occur only on Windows,
|
||||
* or only on Unix, or only with the X11 backend must be included in
|
||||
* similar ifdefs, using the symbols G_OS_WIN32, G_OS_UNIX and
|
||||
* GTK_WINDOWING_X11.
|
||||
*
|
||||
* Internal symbols must be protected by ifdef INCLUDE_INTERNAL_SYMBOLS.
|
||||
*
|
||||
* Symbols which occur only on Windows, or only on Unix, or only with
|
||||
* the X11 backend must be included in similar ifdefs, using the
|
||||
* symbols G_OS_WIN32, G_OS_UNIX and GTK_WINDOWING_X11.
|
||||
*
|
||||
* Every symbol must be included in the right
|
||||
* #ifdef IN_HEADER(sym) #endif and
|
||||
@ -2326,7 +2328,6 @@ gtk_pixmap_set_build_insensitive
|
||||
|
||||
#if IN_HEADER(__GTK_PLUG_H__)
|
||||
#if IN_FILE(__GTK_PLUG_C__)
|
||||
#ifdef GTK_WINDOWING_X11
|
||||
gtk_plug_construct
|
||||
gtk_plug_construct_for_display
|
||||
gtk_plug_get_id
|
||||
@ -2335,7 +2336,6 @@ gtk_plug_new
|
||||
gtk_plug_new_for_display
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if IN_HEADER(__GTK_PREVIEW_H__)
|
||||
#if IN_FILE(__GTK_PREVIEW_C__)
|
||||
@ -2676,7 +2676,6 @@ gtk_size_group_set_mode
|
||||
|
||||
#if IN_HEADER(__GTK_SOCKET_H__)
|
||||
#if IN_FILE(__GTK_SOCKET_C__)
|
||||
#ifdef GTK_WINDOWING_X11
|
||||
gtk_socket_add_id
|
||||
gtk_socket_get_id
|
||||
gtk_socket_get_type G_GNUC_CONST
|
||||
@ -2684,7 +2683,6 @@ gtk_socket_new
|
||||
gtk_socket_steal
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if IN_HEADER(__GTK_SPIN_BUTTON_H__)
|
||||
#if IN_FILE(__GTK_SPIN_BUTTON_C__)
|
||||
|
Loading…
Reference in New Issue
Block a user