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

applied gtk-shige-980311-0.patch.gz, which removes the erronerous

Browse Source 
Thu Mar 12 07:43:33 1998  Tim Janik  <timj@gimp.org>

        * gdk/gdk.h:
        * gdk/gdkvisual.c: applied gtk-shige-980311-0.patch.gz, which removes
        the erronerous gdk_query_visuals() function in favour of
        gdk_list_visuals() which does a correct job.

        * gtk/gtkcontainer.h: applied gtk-draco-980311-0.patch.gz which fixes
        a class cast check.

        * gtk/gtkspinbutton.c: applied gtk-hamann_jeske-980312-0.patch.gz about
        '+' sign acceptance.

        * gtk/gtknotebook.c: applied gtk-hamann_jeske-980311-1.patch.gz which
        cares about delayed tab label creation.
This commit is contained in:
Tim Janik 1998-03-12 07:28:41 +00:00 committed by Tim Janik
parent 093dfedf74
commit a8afd462c0
19 changed files with 305 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ChangeLog
View File

@ -1,3 +1,31 @@
Thu Mar 12 07:43:33 1998 Tim Janik <timj@gimp.org>
* gdk/gdk.h:
* gdk/gdkvisual.c: applied gtk-shige-980311-0.patch.gz, which removes
the erronerous gdk_query_visuals() function in favour of
gdk_list_visuals() which does a correct job.
* gtk/gtkcontainer.h: applied gtk-draco-980311-0.patch.gz which fixes
a class cast check.
* gtk/gtkspinbutton.c: applied gtk-hamann_jeske-980312-0.patch.gz about
'+' sign acceptance.
* gtk/gtknotebook.c: applied gtk-hamann_jeske-980311-1.patch.gz which
cares about delayed tab label creation.
Thu Mar 12 06:58:17 1998 Tim Janik <timj@gimp.org>
* gtk/gtktree.c (gtk_tree_map): avoid warnings about NULL casts.
* gtk/gtkstatusbar.c (gtk_statusbar_destroy): don't leak the context
id key's slist.
* gtk/gtkobject.c (gtk_object_set_data_full): duplicate keys that get
inserted into the hashtable, otherwise this function *forces* the caller
to leak memory, for dynamically allocated keys (problem pinpointed by
Mattias Gronlund).
Tue Mar 10 23:02:42 1998 Owen Taylor <owt1@cornell.edu>
* gdk/gdkdnd.c gtk/gtkclist.c gtk/gtksignal.c gtk/testgtk.c:

28
ChangeLog.pre-2-0
View File

@ -1,3 +1,31 @@
Thu Mar 12 07:43:33 1998 Tim Janik <timj@gimp.org>
* gdk/gdk.h:
* gdk/gdkvisual.c: applied gtk-shige-980311-0.patch.gz, which removes
the erronerous gdk_query_visuals() function in favour of
gdk_list_visuals() which does a correct job.
* gtk/gtkcontainer.h: applied gtk-draco-980311-0.patch.gz which fixes
a class cast check.
* gtk/gtkspinbutton.c: applied gtk-hamann_jeske-980312-0.patch.gz about
'+' sign acceptance.
* gtk/gtknotebook.c: applied gtk-hamann_jeske-980311-1.patch.gz which
cares about delayed tab label creation.
Thu Mar 12 06:58:17 1998 Tim Janik <timj@gimp.org>
* gtk/gtktree.c (gtk_tree_map): avoid warnings about NULL casts.
* gtk/gtkstatusbar.c (gtk_statusbar_destroy): don't leak the context
id key's slist.
* gtk/gtkobject.c (gtk_object_set_data_full): duplicate keys that get
inserted into the hashtable, otherwise this function *forces* the caller
to leak memory, for dynamically allocated keys (problem pinpointed by
Mattias Gronlund).
Tue Mar 10 23:02:42 1998 Owen Taylor <owt1@cornell.edu>
* gdk/gdkdnd.c gtk/gtkclist.c gtk/gtksignal.c gtk/testgtk.c:

28
ChangeLog.pre-2-10
View File

@ -1,3 +1,31 @@
Thu Mar 12 07:43:33 1998 Tim Janik <timj@gimp.org>
* gdk/gdk.h:
* gdk/gdkvisual.c: applied gtk-shige-980311-0.patch.gz, which removes
the erronerous gdk_query_visuals() function in favour of
gdk_list_visuals() which does a correct job.
* gtk/gtkcontainer.h: applied gtk-draco-980311-0.patch.gz which fixes
a class cast check.
* gtk/gtkspinbutton.c: applied gtk-hamann_jeske-980312-0.patch.gz about
'+' sign acceptance.
* gtk/gtknotebook.c: applied gtk-hamann_jeske-980311-1.patch.gz which
cares about delayed tab label creation.
Thu Mar 12 06:58:17 1998 Tim Janik <timj@gimp.org>
* gtk/gtktree.c (gtk_tree_map): avoid warnings about NULL casts.
* gtk/gtkstatusbar.c (gtk_statusbar_destroy): don't leak the context
id key's slist.
* gtk/gtkobject.c (gtk_object_set_data_full): duplicate keys that get
inserted into the hashtable, otherwise this function *forces* the caller
to leak memory, for dynamically allocated keys (problem pinpointed by
Mattias Gronlund).
Tue Mar 10 23:02:42 1998 Owen Taylor <owt1@cornell.edu>
* gdk/gdkdnd.c gtk/gtkclist.c gtk/gtksignal.c gtk/testgtk.c:

28
ChangeLog.pre-2-2
View File

@ -1,3 +1,31 @@
Thu Mar 12 07:43:33 1998 Tim Janik <timj@gimp.org>
* gdk/gdk.h:
* gdk/gdkvisual.c: applied gtk-shige-980311-0.patch.gz, which removes
the erronerous gdk_query_visuals() function in favour of
gdk_list_visuals() which does a correct job.
* gtk/gtkcontainer.h: applied gtk-draco-980311-0.patch.gz which fixes
a class cast check.
* gtk/gtkspinbutton.c: applied gtk-hamann_jeske-980312-0.patch.gz about
'+' sign acceptance.
* gtk/gtknotebook.c: applied gtk-hamann_jeske-980311-1.patch.gz which
cares about delayed tab label creation.
Thu Mar 12 06:58:17 1998 Tim Janik <timj@gimp.org>
* gtk/gtktree.c (gtk_tree_map): avoid warnings about NULL casts.
* gtk/gtkstatusbar.c (gtk_statusbar_destroy): don't leak the context
id key's slist.
* gtk/gtkobject.c (gtk_object_set_data_full): duplicate keys that get
inserted into the hashtable, otherwise this function *forces* the caller
to leak memory, for dynamically allocated keys (problem pinpointed by
Mattias Gronlund).
Tue Mar 10 23:02:42 1998 Owen Taylor <owt1@cornell.edu>
* gdk/gdkdnd.c gtk/gtkclist.c gtk/gtksignal.c gtk/testgtk.c:

28
ChangeLog.pre-2-4
View File

@ -1,3 +1,31 @@
Thu Mar 12 07:43:33 1998 Tim Janik <timj@gimp.org>
* gdk/gdk.h:
* gdk/gdkvisual.c: applied gtk-shige-980311-0.patch.gz, which removes
the erronerous gdk_query_visuals() function in favour of
gdk_list_visuals() which does a correct job.
* gtk/gtkcontainer.h: applied gtk-draco-980311-0.patch.gz which fixes
a class cast check.
* gtk/gtkspinbutton.c: applied gtk-hamann_jeske-980312-0.patch.gz about
'+' sign acceptance.
* gtk/gtknotebook.c: applied gtk-hamann_jeske-980311-1.patch.gz which
cares about delayed tab label creation.
Thu Mar 12 06:58:17 1998 Tim Janik <timj@gimp.org>
* gtk/gtktree.c (gtk_tree_map): avoid warnings about NULL casts.
* gtk/gtkstatusbar.c (gtk_statusbar_destroy): don't leak the context
id key's slist.
* gtk/gtkobject.c (gtk_object_set_data_full): duplicate keys that get
inserted into the hashtable, otherwise this function *forces* the caller
to leak memory, for dynamically allocated keys (problem pinpointed by
Mattias Gronlund).
Tue Mar 10 23:02:42 1998 Owen Taylor <owt1@cornell.edu>
* gdk/gdkdnd.c gtk/gtkclist.c gtk/gtksignal.c gtk/testgtk.c:

28
ChangeLog.pre-2-6
View File

@ -1,3 +1,31 @@
Thu Mar 12 07:43:33 1998 Tim Janik <timj@gimp.org>
* gdk/gdk.h:
* gdk/gdkvisual.c: applied gtk-shige-980311-0.patch.gz, which removes
the erronerous gdk_query_visuals() function in favour of
gdk_list_visuals() which does a correct job.
* gtk/gtkcontainer.h: applied gtk-draco-980311-0.patch.gz which fixes
a class cast check.
* gtk/gtkspinbutton.c: applied gtk-hamann_jeske-980312-0.patch.gz about
'+' sign acceptance.
* gtk/gtknotebook.c: applied gtk-hamann_jeske-980311-1.patch.gz which
cares about delayed tab label creation.
Thu Mar 12 06:58:17 1998 Tim Janik <timj@gimp.org>
* gtk/gtktree.c (gtk_tree_map): avoid warnings about NULL casts.
* gtk/gtkstatusbar.c (gtk_statusbar_destroy): don't leak the context
id key's slist.
* gtk/gtkobject.c (gtk_object_set_data_full): duplicate keys that get
inserted into the hashtable, otherwise this function *forces* the caller
to leak memory, for dynamically allocated keys (problem pinpointed by
Mattias Gronlund).
Tue Mar 10 23:02:42 1998 Owen Taylor <owt1@cornell.edu>
* gdk/gdkdnd.c gtk/gtkclist.c gtk/gtksignal.c gtk/testgtk.c:

28
ChangeLog.pre-2-8
View File

@ -1,3 +1,31 @@
Thu Mar 12 07:43:33 1998 Tim Janik <timj@gimp.org>
* gdk/gdk.h:
* gdk/gdkvisual.c: applied gtk-shige-980311-0.patch.gz, which removes
the erronerous gdk_query_visuals() function in favour of
gdk_list_visuals() which does a correct job.
* gtk/gtkcontainer.h: applied gtk-draco-980311-0.patch.gz which fixes
a class cast check.
* gtk/gtkspinbutton.c: applied gtk-hamann_jeske-980312-0.patch.gz about
'+' sign acceptance.
* gtk/gtknotebook.c: applied gtk-hamann_jeske-980311-1.patch.gz which
cares about delayed tab label creation.
Thu Mar 12 06:58:17 1998 Tim Janik <timj@gimp.org>
* gtk/gtktree.c (gtk_tree_map): avoid warnings about NULL casts.
* gtk/gtkstatusbar.c (gtk_statusbar_destroy): don't leak the context
id key's slist.
* gtk/gtkobject.c (gtk_object_set_data_full): duplicate keys that get
inserted into the hashtable, otherwise this function *forces* the caller
to leak memory, for dynamically allocated keys (problem pinpointed by
Mattias Gronlund).
Tue Mar 10 23:02:42 1998 Owen Taylor <owt1@cornell.edu>
* gdk/gdkdnd.c gtk/gtkclist.c gtk/gtksignal.c gtk/testgtk.c:

8
TODO
View File

@ -5,11 +5,6 @@ Bugs:
* pasting into a GtkEntry that already has a very long string,
causes the app to hang.
* Vertical scrollbar: the expose event looks hosed and is causing
quite a bit of flickering
Actually this affects both scrollbar implementation, you can best
tell if you run the application with --sync (timj)
* signal parameters don't seem to get refreshed on recursive invokations
of GTK_NO_RECURSE signals, which causes the restarted emissions to loose
their actual point, i.e. parameter changes on the restarted emission,
@ -62,9 +57,6 @@ Bugs:
* Force paned window handle to be kept on screen
Additions:
* widgets which are redrawn because of a gtk_widget_draw(,NULL) should
be removed from the redraw queue.
* GScanner: it might be good to ues stdio and getch() instead of 1-character
reads. so one can take advantage of buffering. Currently each read() takes
a separate syscall.

4
gdk/gdk.h
View File

@ -111,8 +111,8 @@ void gdk_query_depths (gint **depths,
gint *count);
void gdk_query_visual_types (GdkVisualType **visual_types,
gint *count);
void gdk_query_visuals (GdkVisual **visuals,
gint *count);
GList* gdk_list_visuals (void);
/* Windows

15
gdk/gdkvisual.c
View File

@ -350,12 +350,17 @@ gdk_query_visual_types (GdkVisualType **visual_types,
*visual_types = available_types;
}
void
gdk_query_visuals (GdkVisual **visual_return,
gint *count)
GList*
gdk_list_visuals (void)
{
*count = nvisuals;
*visual_return = (GdkVisual*) visuals;
GList *list;
guint i;
list = NULL;
for (i = 0; i < nvisuals; ++i)
list = g_list_append (list, (gpointer) &visuals[i]);
return list;
}

15
gdk/x11/gdkvisual-x11.c
View File

@ -350,12 +350,17 @@ gdk_query_visual_types (GdkVisualType **visual_types,
*visual_types = available_types;
}
void
gdk_query_visuals (GdkVisual **visual_return,
gint *count)
GList*
gdk_list_visuals (void)
{
*count = nvisuals;
*visual_return = (GdkVisual*) visuals;
GList *list;
guint i;
list = NULL;
for (i = 0; i < nvisuals; ++i)
list = g_list_append (list, (gpointer) &visuals[i]);
return list;
}

4
gtk/gtkclist.c
View File

@ -1398,11 +1398,11 @@ sync_selection (GtkCList * clist,
switch (mode)
{
case SYNC_INSERT:
(gint) list->data = (gint) list->data + 1;
list->data = ((gchar*) list->data) + 1;
break;
case SYNC_REMOVE:
(gint) list->data = (gint) list->data - 1;
list->data = ((gchar*) list->data) - 1;
break;
default:

2
gtk/gtkcontainer.h
View File

@ -30,7 +30,7 @@ extern "C" {
#define GTK_CONTAINER(obj) (GTK_CHECK_CAST ((obj), gtk_container_get_type (), GtkContainer))
#define GTK_CONTAINER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), gtk_container_get_type, GtkContainerClass))
#define GTK_CONTAINER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), gtk_container_get_type (), GtkContainerClass))
#define GTK_IS_CONTAINER(obj) (GTK_CHECK_TYPE ((obj), gtk_container_get_type ()))
#define GTK_TYPE_CONTAINER (gtk_container_get_type ())

36
gtk/gtknotebook.c
View File

@ -360,8 +360,9 @@ gtk_notebook_insert_page_menu (GtkNotebook *notebook,
if (!tab_label)
{
tab_label = gtk_label_new ("");
page->default_tab = TRUE;
if (notebook->show_tabs)
tab_label = gtk_label_new ("");
}
page->tab_label = tab_label;
page->menu_label = menu_label;
@ -387,8 +388,11 @@ gtk_notebook_insert_page_menu (GtkNotebook *notebook,
notebook->focus_tab = notebook->children;
gtk_widget_set_parent (child, GTK_WIDGET (notebook));
if (tab_label)
{
gtk_widget_set_parent (tab_label, GTK_WIDGET (notebook));
gtk_widget_show (tab_label);
}
if (!notebook->cur_page)
gtk_notebook_switch_page (notebook, page, 0);
@ -403,6 +407,8 @@ gtk_notebook_insert_page_menu (GtkNotebook *notebook,
!GTK_WIDGET_MAPPED (child) && notebook->cur_page == page)
gtk_widget_map (child);
if (tab_label)
{
if (GTK_WIDGET_REALIZED (notebook) &&
!GTK_WIDGET_REALIZED (tab_label))
gtk_widget_realize (tab_label);
@ -411,6 +417,7 @@ gtk_notebook_insert_page_menu (GtkNotebook *notebook,
!GTK_WIDGET_MAPPED (tab_label))
gtk_widget_map (tab_label);
}
}
if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (notebook))
gtk_widget_queue_resize (child);
@ -511,10 +518,13 @@ gtk_notebook_real_remove (GtkNotebook *notebook,
page = list->data;
if ((GTK_WIDGET_VISIBLE (page->child) ||
GTK_WIDGET_VISIBLE (page->tab_label)) && GTK_WIDGET_VISIBLE (notebook))
(page->tab_label && GTK_WIDGET_VISIBLE (page->tab_label)))
&& GTK_WIDGET_VISIBLE (notebook))
need_resize = TRUE;
gtk_widget_unparent (page->child);
if (page->tab_label)
gtk_widget_unparent (page->tab_label);
if (notebook->menu)
@ -766,7 +776,7 @@ gtk_notebook_set_show_tabs (GtkNotebook *notebook,
g_return_if_fail (notebook != NULL);
g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
if (notebook->show_tabs == show_tabs || !GTK_WIDGET_VISIBLE (notebook))
if (notebook->show_tabs == show_tabs)
return;
notebook->show_tabs = show_tabs;
@ -780,6 +790,9 @@ gtk_notebook_set_show_tabs (GtkNotebook *notebook,
{
page = children->data;
children = children->next;
if (page->default_tab)
gtk_widget_destroy (page->tab_label);
else
gtk_widget_hide (page->tab_label);
}
@ -788,13 +801,23 @@ gtk_notebook_set_show_tabs (GtkNotebook *notebook,
}
else
{
gchar string[32];
gint i = 1;
GTK_WIDGET_SET_FLAGS (notebook, GTK_CAN_FOCUS);
while (children)
{
page = children->data;
children = children->next;
if (page->default_tab)
{
sprintf (string, "Page %d", i);
page->tab_label = gtk_label_new (string);
gtk_widget_set_parent (page->tab_label, GTK_WIDGET (notebook));
}
gtk_widget_show (page->tab_label);
i++;
}
}
gtk_widget_queue_resize (GTK_WIDGET (notebook));
@ -867,7 +890,8 @@ gtk_notebook_map (GtkWidget *widget)
page = children->data;
children = children->next;
if (GTK_WIDGET_VISIBLE (page->child) &&
if (page->tab_label &&
GTK_WIDGET_VISIBLE (page->child) &&
!GTK_WIDGET_MAPPED (page->tab_label))
gtk_widget_map (page->tab_label);
}
@ -2855,7 +2879,7 @@ gtk_notebook_update_labels (GtkNotebook *notebook,
page = list->data;
list = list->next;
sprintf (string, "Page %d", page_num);
if (page->default_tab)
if (notebook->show_tabs && page->default_tab)
gtk_label_set (GTK_LABEL (page->tab_label), string);
if (notebook->menu && page->default_menu)
gtk_label_set (GTK_LABEL (page->menu_label), string);
@ -2872,7 +2896,7 @@ gtk_notebook_menu_item_create (GtkNotebook *notebook,
if (page->default_menu)
{
if (GTK_IS_LABEL (page->tab_label))
if (page->tab_label && GTK_IS_LABEL (page->tab_label))
page->menu_label = gtk_label_new (GTK_LABEL (page->tab_label)->label);
else
page->menu_label = gtk_label_new ("");

2
gtk/gtkobject.c
View File

@ -1060,7 +1060,7 @@ gtk_object_set_data_full (GtkObject *object,
if (!id)
{
id = gtk_object_data_id_alloc ();
g_hash_table_insert (object_data_ht, (gpointer) key, id);
g_hash_table_insert (object_data_ht, (gpointer) g_strdup (key), id);
}
odata = object->object_data;

26
gtk/gtkspinbutton.c
View File

@ -1049,14 +1049,28 @@ gtk_spin_button_insert_text (GtkEditable *editable,
if (spin->numeric)
{
struct lconv *lc;
gboolean minus;
gboolean sign;
gint dotpos = -1;
gint i;
gchar pos_sign;
gchar neg_sign;
lc = localeconv ();
minus = (strchr (entry->text, *(lc->negative_sign)) != 0) ;
if (minus && !(*position))
if (*(lc->negative_sign))
neg_sign = *(lc->negative_sign);
else
neg_sign = '-';
if (*(lc->positive_sign))
pos_sign = *(lc->positive_sign);
else
pos_sign = '+';
sign = ((strchr (entry->text, neg_sign) != 0) ||
(strchr (entry->text, pos_sign) != 0));
if (sign && !(*position))
return;
dotpos = strchr (entry->text, *(lc->decimal_point)) - entry->text;
@ -1067,11 +1081,11 @@ gtk_spin_button_insert_text (GtkEditable *editable,
for (i = 0; i < new_text_length; i++)
{
if (new_text[i] == *(lc->negative_sign))
if (new_text[i] == neg_sign || new_text[i] == pos_sign)
{
if (minus || (*position) || i)
if (sign || (*position) || i)
return;
minus = TRUE;
sign = TRUE;
}
else if (new_text[i] == *(lc->decimal_point))
{

10
gtk/gtkstatusbar.c
View File

@ -335,6 +335,11 @@ gtk_statusbar_destroy (GtkObject *object)
g_slist_free (statusbar->messages);
statusbar->messages = NULL;
for (list = statusbar->keys; list; list = list->next)
g_free (list->data);
g_slist_free (statusbar->keys);
statusbar->keys = NULL;
GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
@ -349,10 +354,5 @@ gtk_statusbar_finalize (GtkObject *object)
statusbar = GTK_STATUSBAR (object);
for (list = statusbar->keys; list; list = list->next)
g_free (list->data);
g_slist_free (statusbar->messages);
statusbar->keys = NULL;
GTK_OBJECT_CLASS (parent_class)->finalize (object);
}

9
gtk/gtktree.c
View File

@ -586,12 +586,15 @@ gtk_tree_map (GtkWidget *widget)
!GTK_WIDGET_MAPPED (child))
gtk_widget_map (child);
if ((child = GTK_WIDGET(GTK_TREE_ITEM(child)->subtree)) &&
GTK_WIDGET_VISIBLE (child) &&
!GTK_WIDGET_MAPPED (child))
if (GTK_TREE_ITEM (child)->subtree)
{
child = GTK_WIDGET (GTK_TREE_ITEM (child)->subtree);
if (GTK_WIDGET_VISIBLE (child) && !GTK_WIDGET_MAPPED (child))
gtk_widget_map (child);
}
}
}
static void
gtk_tree_marshal_signal (GtkObject *object,