Commit 213c5160 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Fix glib_config_args gtk_config_args confusion. (pointed out by Roland

Thu Feb 18 11:46:57 1999  Owen Taylor  <otaylor@redhat.com>

	* gtk.m4: Fix glib_config_args gtk_config_args
	  confusion. (pointed out by
	  Roland Dreier <droland@mail.math.okstate.edu>)

	* gtk/gtksocket.c gtk/gtkmain.c gtk/gtkdebug.h
	  (gtk_socket_filter_func): Move the plug-socket
	  debugging code to a new "plugsocket" debug keys
	  from the previous hardcoded DPRINTF.
parent 63e669a7
Thu Feb 18 11:46:57 1999 Owen Taylor <otaylor@redhat.com>
* gtk.m4: Fix glib_config_args gtk_config_args
confusion. (pointed out by
Roland Dreier <droland@mail.math.okstate.edu>)
* gtk/gtksocket.c gtk/gtkmain.c gtk/gtkdebug.h
(gtk_socket_filter_func): Move the plug-socket
debugging code to a new "plugsocket" debug keys
from the previous hardcoded DPRINTF.
Thu Feb 18 00:54:46 1999 Tim Janik <timj@gtk.org>
* gtk/gtkclist.c: added widget arg ::titles_active.
......
Thu Feb 18 11:46:57 1999 Owen Taylor <otaylor@redhat.com>
* gtk.m4: Fix glib_config_args gtk_config_args
confusion. (pointed out by
Roland Dreier <droland@mail.math.okstate.edu>)
* gtk/gtksocket.c gtk/gtkmain.c gtk/gtkdebug.h
(gtk_socket_filter_func): Move the plug-socket
debugging code to a new "plugsocket" debug keys
from the previous hardcoded DPRINTF.
Thu Feb 18 00:54:46 1999 Tim Janik <timj@gtk.org>
* gtk/gtkclist.c: added widget arg ::titles_active.
......
Thu Feb 18 11:46:57 1999 Owen Taylor <otaylor@redhat.com>
* gtk.m4: Fix glib_config_args gtk_config_args
confusion. (pointed out by
Roland Dreier <droland@mail.math.okstate.edu>)
* gtk/gtksocket.c gtk/gtkmain.c gtk/gtkdebug.h
(gtk_socket_filter_func): Move the plug-socket
debugging code to a new "plugsocket" debug keys
from the previous hardcoded DPRINTF.
Thu Feb 18 00:54:46 1999 Tim Janik <timj@gtk.org>
* gtk/gtkclist.c: added widget arg ::titles_active.
......
Thu Feb 18 11:46:57 1999 Owen Taylor <otaylor@redhat.com>
* gtk.m4: Fix glib_config_args gtk_config_args
confusion. (pointed out by
Roland Dreier <droland@mail.math.okstate.edu>)
* gtk/gtksocket.c gtk/gtkmain.c gtk/gtkdebug.h
(gtk_socket_filter_func): Move the plug-socket
debugging code to a new "plugsocket" debug keys
from the previous hardcoded DPRINTF.
Thu Feb 18 00:54:46 1999 Tim Janik <timj@gtk.org>
* gtk/gtkclist.c: added widget arg ::titles_active.
......
Thu Feb 18 11:46:57 1999 Owen Taylor <otaylor@redhat.com>
* gtk.m4: Fix glib_config_args gtk_config_args
confusion. (pointed out by
Roland Dreier <droland@mail.math.okstate.edu>)
* gtk/gtksocket.c gtk/gtkmain.c gtk/gtkdebug.h
(gtk_socket_filter_func): Move the plug-socket
debugging code to a new "plugsocket" debug keys
from the previous hardcoded DPRINTF.
Thu Feb 18 00:54:46 1999 Tim Janik <timj@gtk.org>
* gtk/gtkclist.c: added widget arg ::titles_active.
......
Thu Feb 18 11:46:57 1999 Owen Taylor <otaylor@redhat.com>
* gtk.m4: Fix glib_config_args gtk_config_args
confusion. (pointed out by
Roland Dreier <droland@mail.math.okstate.edu>)
* gtk/gtksocket.c gtk/gtkmain.c gtk/gtkdebug.h
(gtk_socket_filter_func): Move the plug-socket
debugging code to a new "plugsocket" debug keys
from the previous hardcoded DPRINTF.
Thu Feb 18 00:54:46 1999 Tim Janik <timj@gtk.org>
* gtk/gtkclist.c: added widget arg ::titles_active.
......
Thu Feb 18 11:46:57 1999 Owen Taylor <otaylor@redhat.com>
* gtk.m4: Fix glib_config_args gtk_config_args
confusion. (pointed out by
Roland Dreier <droland@mail.math.okstate.edu>)
* gtk/gtksocket.c gtk/gtkmain.c gtk/gtkdebug.h
(gtk_socket_filter_func): Move the plug-socket
debugging code to a new "plugsocket" debug keys
from the previous hardcoded DPRINTF.
Thu Feb 18 00:54:46 1999 Tim Janik <timj@gtk.org>
* gtk/gtkclist.c: added widget arg ::titles_active.
......
......@@ -19,7 +19,7 @@ AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run
do
case "$module" in
gthread)
glib_config_args="$glib_config_args gthread"
gtk_config_args="$gtk_config_args gthread"
;;
esac
done
......
......@@ -24,10 +24,11 @@ extern "C" {
#endif /* __cplusplus */
typedef enum {
GTK_DEBUG_OBJECTS = 1 << 0,
GTK_DEBUG_MISC = 1 << 1,
GTK_DEBUG_SIGNALS = 1 << 2,
GTK_DEBUG_DND = 1 << 3
GTK_DEBUG_OBJECTS = 1 << 0,
GTK_DEBUG_MISC = 1 << 1,
GTK_DEBUG_SIGNALS = 1 << 2,
GTK_DEBUG_DND = 1 << 3,
GTK_DEBUG_PLUGSOCKET = 1 << 4
} GtkDebugFlag;
#ifdef G_ENABLE_DEBUG
......
......@@ -137,7 +137,8 @@ static const GDebugKey gtk_debug_keys[] = {
{"objects", GTK_DEBUG_OBJECTS},
{"misc", GTK_DEBUG_MISC},
{"signals", GTK_DEBUG_SIGNALS},
{"dnd", GTK_DEBUG_DND}
{"dnd", GTK_DEBUG_DND},
{"plugsocket", GTK_DEBUG_PLUGSOCKET}
};
static const guint gtk_ndebug_keys = sizeof (gtk_debug_keys) / sizeof (GDebugKey);
......
......@@ -47,14 +47,6 @@ static GdkFilterReturn gtk_socket_filter_func (GdkXEvent *gdk_xevent,
GdkEvent *event,
gpointer data);
#define DEBUG_PLUGSOCKET
#ifdef DEBUG_PLUGSOCKET
#define DPRINTF(arg) g_print arg
#else
#define DPRINTF(arg)
#endif
/* From Tk */
#define EMBEDDED_APP_WANTS_FOCUS NotifyNormal+20
......@@ -320,16 +312,18 @@ gtk_socket_size_allocate (GtkWidget *widget,
(allocation->height == socket->current_height))
{
gtk_socket_send_configure_event (socket);
DPRINTF(( "No change: %d %d\n",
allocation->width, allocation->height));
GTK_NOTE(PLUGSOCKET,
g_message ("GtkSocket - allocated no change: %d %d",
allocation->width, allocation->height));
}
else
{
gdk_window_move_resize (socket->plug_window,
0, 0,
allocation->width, allocation->height);
DPRINTF(("configuring: %d %d\n",
allocation->width, allocation->height));
GTK_NOTE(PLUGSOCKET,
g_message ("GtkSocket - allocated: %d %d",
allocation->width, allocation->height));
socket->current_width = allocation->width;
socket->current_height = allocation->height;
}
......@@ -351,8 +345,6 @@ gtk_socket_focus_in_event (GtkWidget *widget, GdkEventFocus *event)
g_return_val_if_fail (GTK_IS_SOCKET (widget), FALSE);
socket = GTK_SOCKET (widget);
DPRINTF (( "Got focus\n"));
if (socket->focus_in && socket->plug_window)
XSetInputFocus (GDK_DISPLAY (),
GDK_WINDOW_XWINDOW (socket->plug_window),
......@@ -565,10 +557,11 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
socket->request_width = xcwe->width;
socket->request_height = xcwe->height;
socket->have_size = TRUE;
DPRINTF(("Window created with size: %d %d\n",
socket->request_width,
socket->request_height));
GTK_NOTE(PLUGSOCKET,
g_message ("GtkSocket - window created with size: %d %d",
socket->request_width,
socket->request_height));
gtk_widget_queue_resize (widget);
}
......@@ -593,9 +586,10 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
socket->request_height = xcre->height;
socket->have_size = TRUE;
DPRINTF(("Configure request: %d %d\n",
socket->request_width,
socket->request_height));
GTK_NOTE(PLUGSOCKET,
g_message ("GtkSocket - configure request: %d %d",
socket->request_width,
socket->request_height));
gtk_widget_queue_resize (widget);
}
......@@ -618,8 +612,9 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
(xdwe->window == GDK_WINDOW_XWINDOW (socket->plug_window)))
{
GtkWidget *toplevel;
DPRINTF(("Destroy Notify\n"));
GTK_NOTE(PLUGSOCKET,
g_message ("GtkSocket - destroy notify"));
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
if (toplevel && GTK_IS_WINDOW (toplevel))
......@@ -665,7 +660,8 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
if (xevent->xmaprequest.window ==
GDK_WINDOW_XWINDOW (socket->plug_window))
{
DPRINTF(("Map Request\n"));
GTK_NOTE(PLUGSOCKET,
g_message ("GtkSocket - Map Request"));
gdk_window_show (socket->plug_window);
......
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