Skip to content

GitLab

gtk
gtk
Commit 79546682 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files
Options

gtk/Makefile.am gtk/gtkplug.c on request of Owen, reverted my last change 

2001-04-23  Sven Neumann  <sven@gimp.org>

        * gtk/Makefile.am
        * gtk/gtkplug.c
        * gtk/gtksocket.c: on request of Owen, reverted my last change
        and exclude gtkplug.c/gtksocket.c from the build for non-X11 targets
parent 9fe4ac00
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 47 deletions
ChangeLog
View file @ 79546682
2001-04-23 Sven Neumann <sven@gimp.org>
* gtk/Makefile.am
* gtk/gtkplug.c
* gtk/gtksocket.c: on request of Owen, reverted my last change
and exclude gtkplug.c/gtksocket.c from the build for non-X11 targets
2001-04-23 Sven Neumann <sven@gimp.org>
* gtk/gtkplug.c: put into #ifdef GDK_WINDOWING_X11 to make GTK+
......
ChangeLog.pre-2-0
View file @ 79546682
2001-04-23 Sven Neumann <sven@gimp.org>
* gtk/Makefile.am
* gtk/gtkplug.c
* gtk/gtksocket.c: on request of Owen, reverted my last change
and exclude gtkplug.c/gtksocket.c from the build for non-X11 targets
2001-04-23 Sven Neumann <sven@gimp.org>
* gtk/gtkplug.c: put into #ifdef GDK_WINDOWING_X11 to make GTK+
......
ChangeLog.pre-2-10
View file @ 79546682
2001-04-23 Sven Neumann <sven@gimp.org>
* gtk/Makefile.am
* gtk/gtkplug.c
* gtk/gtksocket.c: on request of Owen, reverted my last change
and exclude gtkplug.c/gtksocket.c from the build for non-X11 targets
2001-04-23 Sven Neumann <sven@gimp.org>
* gtk/gtkplug.c: put into #ifdef GDK_WINDOWING_X11 to make GTK+
......
ChangeLog.pre-2-2
View file @ 79546682
2001-04-23 Sven Neumann <sven@gimp.org>
* gtk/Makefile.am
* gtk/gtkplug.c
* gtk/gtksocket.c: on request of Owen, reverted my last change
and exclude gtkplug.c/gtksocket.c from the build for non-X11 targets
2001-04-23 Sven Neumann <sven@gimp.org>
* gtk/gtkplug.c: put into #ifdef GDK_WINDOWING_X11 to make GTK+
......
ChangeLog.pre-2-4
View file @ 79546682
2001-04-23 Sven Neumann <sven@gimp.org>
* gtk/Makefile.am
* gtk/gtkplug.c
* gtk/gtksocket.c: on request of Owen, reverted my last change
and exclude gtkplug.c/gtksocket.c from the build for non-X11 targets
2001-04-23 Sven Neumann <sven@gimp.org>
* gtk/gtkplug.c: put into #ifdef GDK_WINDOWING_X11 to make GTK+
......
ChangeLog.pre-2-6
View file @ 79546682
2001-04-23 Sven Neumann <sven@gimp.org>
* gtk/Makefile.am
* gtk/gtkplug.c
* gtk/gtksocket.c: on request of Owen, reverted my last change
and exclude gtkplug.c/gtksocket.c from the build for non-X11 targets
2001-04-23 Sven Neumann <sven@gimp.org>
* gtk/gtkplug.c: put into #ifdef GDK_WINDOWING_X11 to make GTK+
......
ChangeLog.pre-2-8
View file @ 79546682
2001-04-23 Sven Neumann <sven@gimp.org>
* gtk/Makefile.am
* gtk/gtkplug.c
* gtk/gtksocket.c: on request of Owen, reverted my last change
and exclude gtkplug.c/gtksocket.c from the build for non-X11 targets
2001-04-23 Sven Neumann <sven@gimp.org>
* gtk/gtkplug.c: put into #ifdef GDK_WINDOWING_X11 to make GTK+
......
gtk/Makefile.am
View file @ 79546682
......@@ -290,7 +290,6 @@ gtk_c_sources = @STRIP_BEGIN@ \
gtkpacker.c \
gtkpaned.c \
gtkpixmap.c \
gtkplug.c \
gtkpreview.c \
gtkprogress.c \
gtkprogressbar.c \
......@@ -307,7 +306,6 @@ gtk_c_sources = @STRIP_BEGIN@ \
gtkseparator.c \
gtksettings.c \
gtksignal.c \
gtksocket.c \
gtkspinbutton.c \
gtkstock.c \
gtkstyle.c \
......@@ -362,6 +360,13 @@ gtk_c_sources = @STRIP_BEGIN@ \
xembed.h \
@STRIP_END@
if USE_X11
gtk_plug_c_sources = @STRIP_BEGIN@ \
gtkplug.c \
gtksocket.c
@STRIP_END@
endif
# we use our own built_sources variable rules to avoid automake's
# BUILT_SOURCES oddities
# we generate frequently rebuild files piggyback on a stamp file, so sources
......@@ -404,7 +409,7 @@ gtk_extra_sources = @STRIP_BEGIN@ \
# setup GTK+ sources and their dependancies
#
gtk_target_headers = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkcompat.h
gtk_target_sources = $(gtk_c_sources)
gtk_target_sources = $(gtk_c_sources) $(gtk_plug_c_sources)
MAINTAINERCLEANFILES += $(gtk_built_sources)
EXTRA_HEADERS +=
EXTRA_DIST += $(gtk_private_h_sources) $(gtk_extra_sources)
......
gtk/gtkplug.c
View file @ 79546682
......@@ -25,10 +25,6 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#include "gdkconfig.h"
#ifdef GDK_WINDOWING_X11
#include "gtkmain.h"
#include "gtkplug.h"
......@@ -718,5 +714,3 @@ gtk_plug_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
return GDK_FILTER_CONTINUE;
}
#endif /* GDK_WINDOWING */
gtk/gtksocket.c
View file @ 79546682
......@@ -25,16 +25,6 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#include "gdkconfig.h"
#if defined (GDK_WINDOWING_X11)
#include "x11/gdkx.h"
#elif defined (GDK_WINDOWING_WIN32)
#include "win32/gdkwin32.h"
#elif defined(GDK_WINDOWING_FB)
#include "linux-fb/gdkfb.h"
#endif
#include "gdk/gdkkeysyms.h"
#include "gtkmain.h"
#include "gtkwindow.h"
......@@ -42,9 +32,9 @@
#include "gtksocket.h"
#include "gtkdnd.h"
#include "xembed.h"
#include "x11/gdkx.h"
#ifdef GDK_WINDOWING_X11
#include "xembed.h"
/* Forward declararations */
......@@ -1096,8 +1086,7 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
GDK_WINDOW_XWINDOW (toplevel->window),
RevertToParent, CurrentTime); /* FIXME? */
}
#endif
}
#endif }
return_val = GDK_FILTER_REMOVE;
break;
case FocusOut:
......@@ -1159,27 +1148,3 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
return return_val;
}
#else
GtkType
gtk_socket_get_type (void)
{
g_error ("GtkSocket not implemented");
return 0;
}
GtkWidget*
gtk_socket_new ()
{
g_error ("GtkSocket not implemented");
return NULL;
}
void
gtk_socket_steal (GtkSocket *socket, GdkNativeWindow id)
{
g_error ("GtkSocket not implemented");
}
#endif /* GDK_WINDOWING */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment