AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

new gtk_main_level(). fixes to gtk_window_show() to prevent -1x-1 size on

Browse Source 
window creation. some indentation fixes.
this basically brings my tree back in sync with the repository again...
This commit is contained in:
Gnome CVS User 1997-11-28 01:22:38 +00:00
parent 64fd713042
commit 8d073b0232
13 changed files with 678 additions and 590 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Fri Nov 28 01:26:55 1997 Tim Janik <timj@psynet.net>
* gtk/gtkwindow.c (gtk_window_show): propagate a size_request before
the initial window creations (prevents windows with size of -1x-1).
* gtk/gtkmain.c (gtk_main_level): new function to determine
the current recursion level of gtkmain().
(gtk_true) (gtk_false): new functions implemented as a convenience
for signals that just need a handler with the appropriate return value.
Tue Nov 25 1997 Owen Taylor <owt1@cornell.edu>
gdk.c: Fix so that "other_events" are actually generated

10
ChangeLog.pre-2-0
View File

@ -1,3 +1,13 @@
Fri Nov 28 01:26:55 1997 Tim Janik <timj@psynet.net>
* gtk/gtkwindow.c (gtk_window_show): propagate a size_request before
the initial window creations (prevents windows with size of -1x-1).
* gtk/gtkmain.c (gtk_main_level): new function to determine
the current recursion level of gtkmain().
(gtk_true) (gtk_false): new functions implemented as a convenience
for signals that just need a handler with the appropriate return value.
Tue Nov 25 1997 Owen Taylor <owt1@cornell.edu>
gdk.c: Fix so that "other_events" are actually generated

10
ChangeLog.pre-2-10
View File

@ -1,3 +1,13 @@
Fri Nov 28 01:26:55 1997 Tim Janik <timj@psynet.net>
* gtk/gtkwindow.c (gtk_window_show): propagate a size_request before
the initial window creations (prevents windows with size of -1x-1).
* gtk/gtkmain.c (gtk_main_level): new function to determine
the current recursion level of gtkmain().
(gtk_true) (gtk_false): new functions implemented as a convenience
for signals that just need a handler with the appropriate return value.
Tue Nov 25 1997 Owen Taylor <owt1@cornell.edu>
gdk.c: Fix so that "other_events" are actually generated

10
ChangeLog.pre-2-2
View File

@ -1,3 +1,13 @@
Fri Nov 28 01:26:55 1997 Tim Janik <timj@psynet.net>
* gtk/gtkwindow.c (gtk_window_show): propagate a size_request before
the initial window creations (prevents windows with size of -1x-1).
* gtk/gtkmain.c (gtk_main_level): new function to determine
the current recursion level of gtkmain().
(gtk_true) (gtk_false): new functions implemented as a convenience
for signals that just need a handler with the appropriate return value.
Tue Nov 25 1997 Owen Taylor <owt1@cornell.edu>
gdk.c: Fix so that "other_events" are actually generated

10
ChangeLog.pre-2-4
View File

@ -1,3 +1,13 @@
Fri Nov 28 01:26:55 1997 Tim Janik <timj@psynet.net>
* gtk/gtkwindow.c (gtk_window_show): propagate a size_request before
the initial window creations (prevents windows with size of -1x-1).
* gtk/gtkmain.c (gtk_main_level): new function to determine
the current recursion level of gtkmain().
(gtk_true) (gtk_false): new functions implemented as a convenience
for signals that just need a handler with the appropriate return value.
Tue Nov 25 1997 Owen Taylor <owt1@cornell.edu>
gdk.c: Fix so that "other_events" are actually generated

10
ChangeLog.pre-2-6
View File

@ -1,3 +1,13 @@
Fri Nov 28 01:26:55 1997 Tim Janik <timj@psynet.net>
* gtk/gtkwindow.c (gtk_window_show): propagate a size_request before
the initial window creations (prevents windows with size of -1x-1).
* gtk/gtkmain.c (gtk_main_level): new function to determine
the current recursion level of gtkmain().
(gtk_true) (gtk_false): new functions implemented as a convenience
for signals that just need a handler with the appropriate return value.
Tue Nov 25 1997 Owen Taylor <owt1@cornell.edu>
gdk.c: Fix so that "other_events" are actually generated

10
ChangeLog.pre-2-8
View File

@ -1,3 +1,13 @@
Fri Nov 28 01:26:55 1997 Tim Janik <timj@psynet.net>
* gtk/gtkwindow.c (gtk_window_show): propagate a size_request before
the initial window creations (prevents windows with size of -1x-1).
* gtk/gtkmain.c (gtk_main_level): new function to determine
the current recursion level of gtkmain().
(gtk_true) (gtk_false): new functions implemented as a convenience
for signals that just need a handler with the appropriate return value.
Tue Nov 25 1997 Owen Taylor <owt1@cornell.edu>
gdk.c: Fix so that "other_events" are actually generated

8
gtk/gtkaccelerator.h
View File

@ -41,10 +41,10 @@ struct _GtkAcceleratorTable
/* Accelerator tables.
*/
GtkAcceleratorTable* gtk_accelerator_table_new (void);
GtkAcceleratorTable* gtk_accelerator_table_find (GtkObject *object,
const gchar *signal_name,
guchar accelerator_key,
guint8 accelerator_mods);
GtkAcceleratorTable* gtk_accelerator_table_find (GtkObject *object,
const gchar *signal_name,
guchar accelerator_key,
guint8 accelerator_mods);
void gtk_accelerator_table_destroy (GtkAcceleratorTable *table);
GtkAcceleratorTable *gtk_accelerator_table_ref (GtkAcceleratorTable *table);

3
gtk/gtkcolorsel.h
View File

@ -68,7 +68,8 @@ struct _GtkColorSelection
GtkWidget *wheel_area;
GtkWidget *value_area;
GtkWidget *sample_area, *sample_area_eb;
GtkWidget *sample_area;
GtkWidget *sample_area_eb;
GtkWidget *scales[8];
GtkWidget *entries[8];

330
gtk/gtkmain.c
View File

@ -8,7 +8,7 @@
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
@ -35,9 +35,9 @@
/* Private type definitions
*/
typedef struct _GtkInitFunction GtkInitFunction;
typedef struct _GtkInitFunction GtkInitFunction;
typedef struct _GtkTimeoutFunction GtkTimeoutFunction;
typedef struct _GtkIdleFunction GtkIdleFunction;
typedef struct _GtkIdleFunction GtkIdleFunction;
struct _GtkInitFunction
{
@ -67,41 +67,42 @@ struct _GtkIdleFunction
};
static void gtk_exit_func (void);
static void gtk_timeout_insert (GtkTimeoutFunction *timeoutf);
static void gtk_handle_current_timeouts (guint32 the_time);
static void gtk_handle_current_idles ();
static void gtk_handle_timeouts (void);
static void gtk_handle_idle (void);
static void gtk_handle_timer (void);
static void gtk_propagate_event (GtkWidget *widget,
GdkEvent *event);
static void gtk_error (char *str);
static void gtk_warning (char *str);
static void gtk_message (char *str);
static void gtk_print (char *str);
static void gtk_exit_func (void);
static void gtk_timeout_insert (GtkTimeoutFunction *timeoutf);
static void gtk_handle_current_timeouts (guint32 the_time);
static void gtk_handle_current_idles (void);
static void gtk_handle_timeouts (void);
static void gtk_handle_idle (void);
static void gtk_handle_timer (void);
static void gtk_propagate_event (GtkWidget *widget,
GdkEvent *event);
static void gtk_error (gchar *str);
static void gtk_warning (gchar *str);
static void gtk_message (gchar *str);
static void gtk_print (gchar *str);
static int done;
static int initialized = FALSE;
static gint done;
static guint main_level = 0;
static gint initialized = FALSE;
static GdkEvent next_event;
static GdkEvent current_event;
static gint have_event = FALSE;
static gint have_next_event = FALSE;
static GList *grabs = NULL; /* A list of grabs. The grabbing widget
static GList *grabs = NULL; /* A list of grabs. The grabbing widget
* is the first one on the list.
*/
static GList *init_functions = NULL; /* A list of init functions.
static GList *init_functions = NULL; /* A list of init functions.
*/
static GList *timeout_functions = NULL; /* A list of timeout functions sorted by
static GList *timeout_functions = NULL; /* A list of timeout functions sorted by
* when the length of the time interval
* remaining. Therefore, the first timeout
* function to expire is at the head of
* the list and the last to expire is at
* the tail of the list.
*/
static GList *idle_functions = NULL; /* A list of idle functions.
static GList *idle_functions = NULL; /* A list of idle functions.
*/
static GList *current_idles = NULL;
@ -109,16 +110,16 @@ static GList *current_timeouts = NULL;
static GMemChunk *timeout_mem_chunk = NULL;
static GMemChunk *idle_mem_chunk = NULL;
static GdkVisual *gtk_visual; /* The visual to be used in creating new
static GdkVisual *gtk_visual; /* The visual to be used in creating new
* widgets.
*/
static GdkColormap *gtk_colormap; /* The colormap to be used in creating new
static GdkColormap *gtk_colormap; /* The colormap to be used in creating new
* widgets.
*/
void
gtk_init (int *argc,
gtk_init (int *argc,
char ***argv)
{
if (0)
@ -128,12 +129,12 @@ gtk_init (int *argc,
g_set_message_handler (gtk_message);
g_set_print_handler (gtk_print);
}
/* Initialize "gdk". We simply pass along the 'argc' and 'argv'
* parameters as they contain information that
*/
gdk_init (argc, argv);
/* Initialize the default visual and colormap to be
* used in creating widgets. (We want to use the system
* defaults so as to be nice to the colormap).
@ -141,14 +142,14 @@ gtk_init (int *argc,
gtk_visual = gdk_visual_get_system ();
gtk_colormap = gdk_colormap_get_system ();
gtk_rc_init ();
gtk_type_init ();
/* Register an exit function to make sure we are able to cleanup.
*/
if (ATEXIT (gtk_exit_func))
g_warning ("unable to register exit function");
/* Set the 'initialized' flag.
*/
initialized = TRUE;
@ -159,8 +160,9 @@ gtk_exit (int errorcode)
{
/* Only if "gtk" has been initialized should we de-initialize.
*/
/* de-initialisation is done by the gtk_exit_funct(),
no need to do this here (Alex J.) */
/* de-initialisation is done by the gtk_exit_funct(),
* no need to do this here (Alex J.)
*/
gdk_exit(errorcode);
}
@ -177,25 +179,35 @@ gtk_main ()
GList *functions;
GtkInitFunction *init;
int old_done;
main_level++;
tmp_list = functions = init_functions;
init_functions = NULL;
while (tmp_list)
{
init = tmp_list->data;
tmp_list = tmp_list->next;
(* init->function) (init->data);
g_free (init);
}
g_list_free (functions);
old_done = done;
while (!gtk_main_iteration ())
;
done = old_done;
main_level--;
}
guint
gtk_main_level (void)
{
return main_level;
}
void
@ -210,12 +222,13 @@ gtk_main_iteration ()
GdkEvent event_copy;
GtkWidget *event_widget;
GtkWidget *grab_widget;
done = FALSE;
/* If this is a recursive call, and there are pending timeouts or
idles, finish them, then return immediately to avoid blocking
in gdk_event_get() */
* idles, finish them, then return immediately to avoid blocking
* in gdk_event_get()
*/
if (current_timeouts)
{
gtk_handle_current_timeouts( gdk_time_get());
@ -226,7 +239,7 @@ gtk_main_iteration ()
gtk_handle_current_idles();
return done;
}
/* If there is a valid event in 'next_event' then copy
* it to 'event' and unset the flag.
*/
@ -236,7 +249,7 @@ gtk_main_iteration ()
have_event = TRUE;
current_event = next_event;
}
/* If we don't have an event then get one.
*/
if (!have_event)
@ -248,10 +261,10 @@ gtk_main_iteration ()
* the first timeout function).
*/
gtk_handle_timer ();
have_event = gdk_event_get (&current_event, NULL, NULL);
}
/* "gdk_event_get" can return FALSE if the timer goes off
* and no events are pending. Therefore, we should make
* sure that we got an event before continuing.
@ -259,12 +272,12 @@ gtk_main_iteration ()
if (have_event)
{
have_event = FALSE;
/* If there are any events pending then get the next one.
*/
if (gdk_events_pending () > 0)
have_next_event = gdk_event_get (&next_event, NULL, NULL);
/* Try to compress enter/leave notify events. These event
* pairs occur when the mouse is dragged quickly across
* a window with many buttons (or through a menu). Instead
@ -281,18 +294,18 @@ gtk_main_iteration ()
(next_event.type != current_event.type) &&
(next_event.any.window == current_event.any.window))
return done;
/* Find the widget which got the event. We store the widget
* in the user_data field of GdkWindow's.
*/
event_widget = gtk_get_event_widget (&current_event);
/* If there is a grab in effect...
*/
if (grabs)
{
grab_widget = grabs->data;
/* If the grab widget is an ancestor of the event widget
* then we send the event to the original event widget.
* This is the key to implementing modality.
@ -304,7 +317,7 @@ gtk_main_iteration ()
{
grab_widget = event_widget;
}
/* Not all events get sent to the grabbing widget.
* The delete, destroy, expose, focus change and resize
* events still get sent to the event widget because
@ -317,24 +330,25 @@ gtk_main_iteration ()
{
case GDK_NOTHING:
break;
case GDK_DELETE:
if (gtk_widget_event (event_widget, &event_copy))
gtk_widget_destroy (event_widget);
break;
case GDK_DESTROY:
gtk_widget_event (event_widget, &event_copy);
gtk_widget_destroy (event_widget);
break;
case GDK_PROPERTY_NOTIFY:
/* To handle selection INCR transactions, we select
PropertyNotify events on the requestor window and create
a corresponding (fake) GdkWindow so that events get
here. There won't be a widget though, so we have to handle
them specially */
* PropertyNotify events on the requestor window and create
* a corresponding (fake) GdkWindow so that events get
* here. There won't be a widget though, so we have to handle
* them specially
*/
if (event_widget == NULL)
{
gtk_selection_incr_event (event_copy.any.window,
@ -342,7 +356,7 @@ gtk_main_iteration ()
break;
}
/* otherwise fall through */
case GDK_EXPOSE:
case GDK_FOCUS_CHANGE:
case GDK_CONFIGURE:
@ -354,7 +368,7 @@ gtk_main_iteration ()
case GDK_CLIENT_EVENT:
gtk_widget_event (event_widget, &event_copy);
break;
case GDK_MOTION_NOTIFY:
case GDK_BUTTON_PRESS:
case GDK_2BUTTON_PRESS:
@ -372,7 +386,7 @@ gtk_main_iteration ()
case GDK_DROP_DATA_AVAIL:
gtk_propagate_event (grab_widget, &event_copy);
break;
case GDK_ENTER_NOTIFY:
case GDK_LEAVE_NOTIFY:
if (grab_widget && GTK_WIDGET_IS_SENSITIVE (grab_widget))
@ -382,14 +396,14 @@ gtk_main_iteration ()
}
else
{
if (gdk_events_pending() == 0)
gtk_handle_idle ();
if (gdk_events_pending() == 0)
gtk_handle_idle ();
}
/* Handle a timeout functions that may have expired.
*/
gtk_handle_timeouts ();
return done;
}
@ -425,36 +439,36 @@ gtk_grab_remove (GtkWidget *widget)
void
gtk_init_add (GtkFunction function,
gpointer data)
gpointer data)
{
GtkInitFunction *init;
init = g_new (GtkInitFunction, 1);
init->function = function;
init->data = data;
init_functions = g_list_prepend (init_functions, init);
}
static gint
gtk_timeout_add_internal (guint32 interval,
gint interp,
gint interp,
GtkFunction function,
gpointer data,
GtkDestroyNotify destroy)
{
static gint timeout_tag = 1;
GtkTimeoutFunction *timeoutf;
/* Create a new timeout function structure.
* The start time is the current time.
*/
if (!timeout_mem_chunk)
timeout_mem_chunk = g_mem_chunk_new ("timeout mem chunk", sizeof (GtkTimeoutFunction),
1024, G_ALLOC_AND_FREE);
timeoutf = g_chunk_new (GtkTimeoutFunction, timeout_mem_chunk);
timeoutf->tag = timeout_tag++;
timeoutf->start = gdk_time_get ();
timeoutf->interval = interval;
@ -463,9 +477,9 @@ gtk_timeout_add_internal (guint32 interval,
timeoutf->function = function;
timeoutf->data = data;
timeoutf->destroy = destroy;
gtk_timeout_insert (timeoutf);
return timeoutf->tag;
}
@ -486,14 +500,14 @@ gtk_timeout_add (guint32 interval,
}
gint
gtk_timeout_add_interp (guint32 interval,
gtk_timeout_add_interp (guint32 interval,
GtkCallbackMarshal function,
gpointer data,
gpointer data,
GtkDestroyNotify destroy)
{
return gtk_timeout_add_internal (interval, TRUE,
(GtkFunction) function,
data, destroy);
data, destroy);
}
void
@ -501,7 +515,7 @@ gtk_timeout_remove (gint tag)
{
GtkTimeoutFunction *timeoutf;
GList *tmp_list;
/* Remove a timeout function.
* (Which, basically, involves searching the
* list for the tag).
@ -522,7 +536,7 @@ gtk_timeout_remove (gint tag)
tmp_list = tmp_list->next;
}
tmp_list = current_timeouts;
while (tmp_list)
{
@ -542,28 +556,28 @@ gtk_timeout_remove (gint tag)
}
static gint
gtk_idle_add_internal (gint interp,
GtkFunction function,
gpointer data,
gtk_idle_add_internal (gint interp,
GtkFunction function,
gpointer data,
GtkDestroyNotify destroy)
{
static gint idle_tag = 1;
GtkIdleFunction *idlef;
if (!idle_mem_chunk)
idle_mem_chunk = g_mem_chunk_new ("idle mem chunk", sizeof (GtkIdleFunction),
1024, G_ALLOC_AND_FREE);
idlef = g_chunk_new (GtkIdleFunction, idle_mem_chunk);
idlef->tag = idle_tag++;
idlef->interp = interp;
idlef->function = function;
idlef->data = data;
idlef->destroy = destroy;
idle_functions = g_list_append (idle_functions, idlef);
return idlef->tag;
}
@ -577,15 +591,15 @@ gtk_idle_destroy (GtkIdleFunction *idlef)
gint
gtk_idle_add (GtkFunction function,
gpointer data)
gpointer data)
{
return gtk_idle_add_internal (FALSE, function, data, NULL);
}
gint
gtk_idle_add_interp (GtkCallbackMarshal function,
gpointer data,
GtkDestroyNotify destroy)
gpointer data,
GtkDestroyNotify destroy)
{
return gtk_idle_add_internal (TRUE, (GtkFunction)function, data, destroy);
}
@ -595,7 +609,7 @@ gtk_idle_remove (gint tag)
{
GtkIdleFunction *idlef;
GList *tmp_list;
tmp_list = idle_functions;
while (tmp_list)
{
@ -612,7 +626,7 @@ gtk_idle_remove (gint tag)
tmp_list = tmp_list->next;
}
tmp_list = current_idles;
while (tmp_list)
{
@ -636,7 +650,7 @@ gtk_idle_remove_by_data (gpointer data)
{
GtkIdleFunction *idlef;
GList *tmp_list;
tmp_list = idle_functions;
while (tmp_list)
{
@ -653,7 +667,7 @@ gtk_idle_remove_by_data (gpointer data)
tmp_list = tmp_list->next;
}
tmp_list = current_idles;
while (tmp_list)
{
@ -676,7 +690,7 @@ void
gtk_get_current_event (GdkEvent *event)
{
g_assert (event != NULL);
*event = current_event;
}
@ -685,7 +699,7 @@ gtk_get_event_widget (GdkEvent *event)
{
GtkWidget *widget;
gdk_window_get_user_data (event->any.window, (void**) &widget);
return widget;
}
@ -705,9 +719,9 @@ gtk_timeout_insert (GtkTimeoutFunction *timeoutf)
GtkTimeoutFunction *temp;
GList *temp_list;
GList *new_list;
g_assert (timeoutf != NULL);
/* Insert the timeout function appropriately.
* Appropriately meaning sort it into the list
* of timeout functions.
@ -762,12 +776,12 @@ gtk_handle_current_timeouts (guint32 the_time)
{
GList *tmp_list;
GtkTimeoutFunction *timeoutf;
while (current_timeouts)
{
tmp_list = current_timeouts;
timeoutf = tmp_list->data;
current_timeouts = g_list_remove_link (current_timeouts, tmp_list);
g_list_free (tmp_list);
@ -792,25 +806,25 @@ gtk_handle_timeouts ()
GList *tmp_list2;
GList *tmp_list3;
GtkTimeoutFunction *timeoutf;
/* Caller must already have called gtk_handle_current_timeouts if
* necessary */
g_assert (current_timeouts == NULL);
if (timeout_functions)
{
the_time = gdk_time_get ();
tmp_list = timeout_functions;
while (tmp_list)
{
timeoutf = tmp_list->data;
if (timeoutf->interval <= (the_time - timeoutf->start))
{
tmp_list2 = tmp_list;
tmp_list = tmp_list->next;
timeout_functions = g_list_remove_link (timeout_functions, tmp_list2);
current_timeouts = g_list_concat (current_timeouts, tmp_list2);
}
@ -821,7 +835,7 @@ gtk_handle_timeouts ()
tmp_list = tmp_list->next;
}
}
if (current_timeouts)
gtk_handle_current_timeouts(the_time);
}
@ -845,18 +859,18 @@ gtk_idle_invoke_function (GtkIdleFunction *idlef)
return ret_val;
}
}
static void
gtk_handle_current_idles ()
{
GList *tmp_list;
GtkIdleFunction *idlef;
while (current_idles)
{
tmp_list = current_idles;
idlef = tmp_list->data;
current_idles = g_list_remove_link (current_idles, tmp_list);
if (gtk_idle_invoke_function (idlef) == FALSE)
@ -877,16 +891,16 @@ gtk_handle_idle ()
GtkIdleFunction *idlef;
GList *tmp_list;
GList *tmp_list2;
/* Caller must already have called gtk_handle_current_idles if
necessary */
g_assert (current_idles == NULL);
if (idle_functions)
{
current_idles = idle_functions;
idle_functions = NULL;
gtk_handle_current_idles();
}
}
@ -895,7 +909,7 @@ static void
gtk_handle_timer ()
{
GtkTimeoutFunction *timeoutf;
if (idle_functions)
{
gdk_timer_set (0);
@ -922,12 +936,12 @@ gtk_propagate_event (GtkWidget *widget,
gint handled_event;
gint parent_old_value;
gint old_value;
g_return_if_fail (widget != NULL);
g_return_if_fail (event != NULL);
handled_event = FALSE;
if ((event->type == GDK_KEY_PRESS) ||
(event->type == GDK_KEY_RELEASE))
{
@ -941,12 +955,12 @@ gtk_propagate_event (GtkWidget *widget,
{
parent_old_value = GTK_OBJECT_IN_CALL (parent);
GTK_OBJECT_SET_FLAGS (parent, GTK_IN_CALL);
handled_event = gtk_widget_event (parent, event);
if (!parent_old_value)
GTK_OBJECT_UNSET_FLAGS (parent, GTK_IN_CALL);
if (GTK_OBJECT_NEED_DESTROY (parent) && !GTK_OBJECT_IN_CALL (parent))
{
gtk_object_destroy (GTK_OBJECT (parent));
@ -954,12 +968,12 @@ gtk_propagate_event (GtkWidget *widget,
}
}
}
if (!handled_event)
{
old_value = GTK_OBJECT_IN_CALL (widget);
GTK_OBJECT_SET_FLAGS (widget, GTK_IN_CALL);
/* Other events get propagated up the widget tree
* so that parents can see the button and motion
* events of the children.
@ -969,28 +983,28 @@ gtk_propagate_event (GtkWidget *widget,
{
parent_old_value = GTK_OBJECT_IN_CALL (parent);
GTK_OBJECT_SET_FLAGS (parent, GTK_IN_CALL);
handled_event = (!GTK_WIDGET_IS_SENSITIVE (parent) ||
gtk_widget_event (parent, event));
if (!parent_old_value)
GTK_OBJECT_UNSET_FLAGS (parent, GTK_IN_CALL);
if (handled_event)
break;
if (GTK_OBJECT_NEED_DESTROY (parent) && !GTK_OBJECT_IN_CALL (parent))
{
gtk_object_destroy (GTK_OBJECT (parent));
break;
}
parent = parent->parent;
}
if (!old_value)
GTK_OBJECT_UNSET_FLAGS (widget, GTK_IN_CALL);
if (GTK_OBJECT_NEED_DESTROY (widget) && !GTK_OBJECT_IN_CALL (widget))
gtk_object_destroy (GTK_OBJECT (widget));
}
@ -998,25 +1012,25 @@ gtk_propagate_event (GtkWidget *widget,
static void
gtk_error (char *str)
gtk_error (gchar *str)
{
gtk_print (str);
}
static void
gtk_warning (char *str)
gtk_warning (gchar *str)
{
gtk_print (str);
}
static void
gtk_message (char *str)
gtk_message (gchar *str)
{
gtk_print (str);
}
static void
gtk_print (char *str)
gtk_print (gchar *str)
{
static GtkWidget *window = NULL;
static GtkWidget *text;
@ -1028,82 +1042,82 @@ gtk_print (char *str)
GtkWidget *vscrollbar;
GtkWidget *separator;
GtkWidget *button;
if (level > 0)
{
fputs (str, stdout);
fflush (stdout);
return;
}
if (!window)
{
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
/*
gtk_signal_connect (GTK_OBJECT (window), "destroy",
(GtkSignalFunc) gtk_widget_destroyed,
&window);
*/
* gtk_signal_connect (GTK_OBJECT (window), "destroy",
* (GtkSignalFunc) gtk_widget_destroyed,
* &window);
*/
gtk_window_set_title (GTK_WINDOW (window), "Messages");
box1 = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (window), box1);
gtk_widget_show (box1);
box2 = gtk_vbox_new (FALSE, 10);
gtk_container_border_width (GTK_CONTAINER (box2), 10);
gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
gtk_widget_show (box2);
table = gtk_table_new (2, 2, FALSE);
gtk_table_set_row_spacing (GTK_TABLE (table), 0, 2);
gtk_table_set_col_spacing (GTK_TABLE (table), 0, 2);
gtk_box_pack_start (GTK_BOX (box2), table, TRUE, TRUE, 0);
gtk_widget_show (table);
text = gtk_text_new (NULL, NULL);
gtk_text_set_editable (GTK_TEXT (text), FALSE);
gtk_table_attach_defaults (GTK_TABLE (table), text, 0, 1, 0, 1);
gtk_widget_show (text);
gtk_widget_realize (text);
hscrollbar = gtk_hscrollbar_new (GTK_TEXT (text)->hadj);
gtk_table_attach (GTK_TABLE (table), hscrollbar, 0, 1, 1, 2,
GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (hscrollbar);
vscrollbar = gtk_vscrollbar_new (GTK_TEXT (text)->vadj);
gtk_table_attach (GTK_TABLE (table), vscrollbar, 1, 2, 0, 1,
GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_widget_show (vscrollbar);
separator = gtk_hseparator_new ();
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
gtk_widget_show (separator);
box2 = gtk_vbox_new (FALSE, 10);
gtk_container_border_width (GTK_CONTAINER (box2), 10);
gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
gtk_widget_show (box2);
button = gtk_button_new_with_label ("close");
gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) gtk_widget_hide,
GTK_OBJECT (window));
(GtkSignalFunc) gtk_widget_hide,
GTK_OBJECT (window));
gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_widget_grab_default (button);
gtk_widget_show (button);
}
level += 1;
gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, str, -1);
level -= 1;
if (!GTK_WIDGET_VISIBLE (window))
gtk_widget_show (window);
}

59
gtk/gtkmain.h
View File

@ -8,7 +8,7 @@
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
@ -30,42 +30,43 @@ extern "C" {
/* Initialization, exit, mainloop and miscellaneous routines
*/
void gtk_init (int *argc,
char ***argv);
void gtk_exit (gint error_code);
gchar* gtk_set_locale (void);
void gtk_main (void);
void gtk_main_quit (void);
gint gtk_main_iteration (void);
void gtk_init (int *argc,
char ***argv);
void gtk_exit (gint error_code);
gchar* gtk_set_locale (void);
void gtk_main (void);
guint gtk_main_level (void);
void gtk_main_quit (void);
gint gtk_main_iteration (void);
gint gtk_true (void);
gint gtk_false (void);
void gtk_grab_add (GtkWidget *widget);
void gtk_grab_remove (GtkWidget *widget);
void gtk_grab_add (GtkWidget *widget);
void gtk_grab_remove (GtkWidget *widget);
void gtk_init_add (GtkFunction function,
gpointer data);
void gtk_init_add (GtkFunction function,
gpointer data);
gint gtk_timeout_add (guint32 interval,
GtkFunction function,
gpointer data);
gint gtk_timeout_add_interp (guint32 interval,
GtkCallbackMarshal function,
gpointer data,
GtkDestroyNotify notify);
void gtk_timeout_remove (gint tag);
gint gtk_timeout_add (guint32 interval,
GtkFunction function,
gpointer data);
gint gtk_timeout_add_interp (guint32 interval,
GtkCallbackMarshal function,
gpointer data,
GtkDestroyNotify notify);
void gtk_timeout_remove (gint tag);
gint gtk_idle_add (GtkFunction function,
gpointer data);
gint gtk_idle_add_interp (GtkCallbackMarshal function,
gpointer data,
GtkDestroyNotify destroy);
void gtk_idle_remove (gint tag);
void gtk_idle_remove_by_data (gpointer data);
gint gtk_idle_add (GtkFunction function,
gpointer data);
gint gtk_idle_add_interp (GtkCallbackMarshal function,
gpointer data,
GtkDestroyNotify destroy);
void gtk_idle_remove (gint tag);
void gtk_idle_remove_by_data (gpointer data);
void gtk_get_current_event (GdkEvent *event);
GtkWidget* gtk_get_event_widget (GdkEvent *event);
void gtk_get_current_event (GdkEvent *event);
GtkWidget* gtk_get_event_widget (GdkEvent *event);
#ifdef __cplusplus

797
gtk/gtkwidget.c
View File

File diff suppressed because it is too large Load Diff

1
gtk/gtkwindow.c
View File

@ -416,6 +416,7 @@ gtk_window_show (GtkWidget *widget)
g_return_if_fail (GTK_IS_WINDOW (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE);
gtk_container_need_resize (GTK_CONTAINER (widget));
gtk_widget_map (widget);
}