diff --git a/ChangeLog b/ChangeLog index 7330f901ef..963cbfe470 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +Tue Nov 3 13:16:36 PST 1998 Manish Singh + + * gtk/Makefile.am: remove explict -ldl, gmodule takes care of that + + * gtk/gtkdnd.c: start TARGET_MOTIF_SUCCESS from 0x40000000 instead + of 0x80000000, so we stay within the bounds of a postive signed + int (it broke some compilers) + + * gtk/gtkmenushell.c + * gtk/gtkoptionmenu.c: merges from HEAD to make option menus work + when some of the menuitems are hidden + + * gtk/gtkthemes.h: don't include dlfcn.h explictly, gmodule takes + care of that + + * gtk/gtkwidget.c: add a dummy continue after the line label + next_rect, since some compilers don't like label: } + Sun Nov 1 20:05:55 PST 1998 Manish Singh * Okay, so we need the X11R6 keysyms so programs don't have to diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 7330f901ef..963cbfe470 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,21 @@ +Tue Nov 3 13:16:36 PST 1998 Manish Singh + + * gtk/Makefile.am: remove explict -ldl, gmodule takes care of that + + * gtk/gtkdnd.c: start TARGET_MOTIF_SUCCESS from 0x40000000 instead + of 0x80000000, so we stay within the bounds of a postive signed + int (it broke some compilers) + + * gtk/gtkmenushell.c + * gtk/gtkoptionmenu.c: merges from HEAD to make option menus work + when some of the menuitems are hidden + + * gtk/gtkthemes.h: don't include dlfcn.h explictly, gmodule takes + care of that + + * gtk/gtkwidget.c: add a dummy continue after the line label + next_rect, since some compilers don't like label: } + Sun Nov 1 20:05:55 PST 1998 Manish Singh * Okay, so we need the X11R6 keysyms so programs don't have to diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7330f901ef..963cbfe470 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,21 @@ +Tue Nov 3 13:16:36 PST 1998 Manish Singh + + * gtk/Makefile.am: remove explict -ldl, gmodule takes care of that + + * gtk/gtkdnd.c: start TARGET_MOTIF_SUCCESS from 0x40000000 instead + of 0x80000000, so we stay within the bounds of a postive signed + int (it broke some compilers) + + * gtk/gtkmenushell.c + * gtk/gtkoptionmenu.c: merges from HEAD to make option menus work + when some of the menuitems are hidden + + * gtk/gtkthemes.h: don't include dlfcn.h explictly, gmodule takes + care of that + + * gtk/gtkwidget.c: add a dummy continue after the line label + next_rect, since some compilers don't like label: } + Sun Nov 1 20:05:55 PST 1998 Manish Singh * Okay, so we need the X11R6 keysyms so programs don't have to diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 7330f901ef..963cbfe470 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,21 @@ +Tue Nov 3 13:16:36 PST 1998 Manish Singh + + * gtk/Makefile.am: remove explict -ldl, gmodule takes care of that + + * gtk/gtkdnd.c: start TARGET_MOTIF_SUCCESS from 0x40000000 instead + of 0x80000000, so we stay within the bounds of a postive signed + int (it broke some compilers) + + * gtk/gtkmenushell.c + * gtk/gtkoptionmenu.c: merges from HEAD to make option menus work + when some of the menuitems are hidden + + * gtk/gtkthemes.h: don't include dlfcn.h explictly, gmodule takes + care of that + + * gtk/gtkwidget.c: add a dummy continue after the line label + next_rect, since some compilers don't like label: } + Sun Nov 1 20:05:55 PST 1998 Manish Singh * Okay, so we need the X11R6 keysyms so programs don't have to diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7330f901ef..963cbfe470 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,21 @@ +Tue Nov 3 13:16:36 PST 1998 Manish Singh + + * gtk/Makefile.am: remove explict -ldl, gmodule takes care of that + + * gtk/gtkdnd.c: start TARGET_MOTIF_SUCCESS from 0x40000000 instead + of 0x80000000, so we stay within the bounds of a postive signed + int (it broke some compilers) + + * gtk/gtkmenushell.c + * gtk/gtkoptionmenu.c: merges from HEAD to make option menus work + when some of the menuitems are hidden + + * gtk/gtkthemes.h: don't include dlfcn.h explictly, gmodule takes + care of that + + * gtk/gtkwidget.c: add a dummy continue after the line label + next_rect, since some compilers don't like label: } + Sun Nov 1 20:05:55 PST 1998 Manish Singh * Okay, so we need the X11R6 keysyms so programs don't have to diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7330f901ef..963cbfe470 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,21 @@ +Tue Nov 3 13:16:36 PST 1998 Manish Singh + + * gtk/Makefile.am: remove explict -ldl, gmodule takes care of that + + * gtk/gtkdnd.c: start TARGET_MOTIF_SUCCESS from 0x40000000 instead + of 0x80000000, so we stay within the bounds of a postive signed + int (it broke some compilers) + + * gtk/gtkmenushell.c + * gtk/gtkoptionmenu.c: merges from HEAD to make option menus work + when some of the menuitems are hidden + + * gtk/gtkthemes.h: don't include dlfcn.h explictly, gmodule takes + care of that + + * gtk/gtkwidget.c: add a dummy continue after the line label + next_rect, since some compilers don't like label: } + Sun Nov 1 20:05:55 PST 1998 Manish Singh * Okay, so we need the X11R6 keysyms so programs don't have to diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7330f901ef..963cbfe470 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,21 @@ +Tue Nov 3 13:16:36 PST 1998 Manish Singh + + * gtk/Makefile.am: remove explict -ldl, gmodule takes care of that + + * gtk/gtkdnd.c: start TARGET_MOTIF_SUCCESS from 0x40000000 instead + of 0x80000000, so we stay within the bounds of a postive signed + int (it broke some compilers) + + * gtk/gtkmenushell.c + * gtk/gtkoptionmenu.c: merges from HEAD to make option menus work + when some of the menuitems are hidden + + * gtk/gtkthemes.h: don't include dlfcn.h explictly, gmodule takes + care of that + + * gtk/gtkwidget.c: add a dummy continue after the line label + next_rect, since some compilers don't like label: } + Sun Nov 1 20:05:55 PST 1998 Manish Singh * Okay, so we need the X11R6 keysyms so programs don't have to diff --git a/gtk/Makefile.am b/gtk/Makefile.am index d0c18b8417..fe8dbe7068 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -331,7 +331,7 @@ LDADDS = \ @x_ldflags@ \ @x_libs@ \ @GLIB_LIBS@ \ - -lm -ldl + -lm testgtk_DEPENDENCIES = $(DEPS) testinput_DEPENDENCIES = $(DEPS) diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index ff74eb3721..151a5c0eb8 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -129,7 +129,7 @@ struct _GtkDragFindData { /* Enumeration for some targets we handle internally */ enum { - TARGET_MOTIF_SUCCESS = 0x80000000, + TARGET_MOTIF_SUCCESS = 0x40000000, TARGET_MOTIF_FAILURE, TARGET_DELETE }; @@ -2100,6 +2100,7 @@ gtk_drag_source_event_cb (GtkWidget *widget, break; default: /* hit for 2/3BUTTON_PRESS */ + break; } return FALSE; } diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index a6a3bb20df..ad90966211 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -868,7 +868,9 @@ gtk_menu_shell_move_selected (GtkMenuShell *menu_shell, { node = node->next; while (node != start_node && - (!node || !GTK_WIDGET_SENSITIVE (node->data))) + (!node || + !GTK_WIDGET_SENSITIVE (node->data) || + !GTK_WIDGET_VISIBLE (node->data) )) { if (!node) node = menu_shell->children; @@ -880,7 +882,9 @@ gtk_menu_shell_move_selected (GtkMenuShell *menu_shell, { node = node->prev; while (node != start_node && - (!node || !GTK_WIDGET_SENSITIVE (node->data))) + (!node || + !GTK_WIDGET_SENSITIVE (node->data) || + !GTK_WIDGET_VISIBLE (node->data) )) { if (!node) node = g_list_last (menu_shell->children); diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c index 5e15501366..c92aa879d1 100644 --- a/gtk/gtkoptionmenu.c +++ b/gtk/gtkoptionmenu.c @@ -643,7 +643,9 @@ gtk_option_menu_position (GtkMenu *menu, if (active == child) break; - menu_ypos -= child->allocation.height; + if (GTK_WIDGET_VISIBLE (child)) + menu_ypos -= child->allocation.height; + children = children->next; } diff --git a/gtk/gtkthemes.h b/gtk/gtkthemes.h index 1916db08fd..135b17ed9d 100644 --- a/gtk/gtkthemes.h +++ b/gtk/gtkthemes.h @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 86bd25225b..c8bd1a87e6 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -2060,6 +2060,7 @@ gtk_widget_idle_draw (gpointer data) draw_data_list = draw_data_list->next; next_rect: + continue; } widget_list = widget_list->next; }