Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove explict -ldl, gmodule takes care of that

Browse Source 
* 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: }

-Yosh
This commit is contained in:
Manish Singh
1998-11-03 21:17:52 +00:00
parent 33dc032aa2
commit 0a5b61a4da
13 changed files with 139 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@@ -1,3 +1,21 @@
Tue Nov 3 13:16:36 PST 1998 Manish Singh <yosh@gimp.org>
* 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 <yosh@gimp.org>
* Okay, so we need the X11R6 keysyms so programs don't have to

18
ChangeLog.pre-2-0
View File

@@ -1,3 +1,21 @@
Tue Nov 3 13:16:36 PST 1998 Manish Singh <yosh@gimp.org>
* 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 <yosh@gimp.org>
* Okay, so we need the X11R6 keysyms so programs don't have to

18
ChangeLog.pre-2-10
View File

@@ -1,3 +1,21 @@
Tue Nov 3 13:16:36 PST 1998 Manish Singh <yosh@gimp.org>
* 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 <yosh@gimp.org>
* Okay, so we need the X11R6 keysyms so programs don't have to

18
ChangeLog.pre-2-2
View File

@@ -1,3 +1,21 @@
Tue Nov 3 13:16:36 PST 1998 Manish Singh <yosh@gimp.org>
* 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 <yosh@gimp.org>
* Okay, so we need the X11R6 keysyms so programs don't have to

18
ChangeLog.pre-2-4
View File

@@ -1,3 +1,21 @@
Tue Nov 3 13:16:36 PST 1998 Manish Singh <yosh@gimp.org>
* 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 <yosh@gimp.org>
* Okay, so we need the X11R6 keysyms so programs don't have to

18
ChangeLog.pre-2-6
View File

@@ -1,3 +1,21 @@
Tue Nov 3 13:16:36 PST 1998 Manish Singh <yosh@gimp.org>
* 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 <yosh@gimp.org>
* Okay, so we need the X11R6 keysyms so programs don't have to

18
ChangeLog.pre-2-8
View File

@@ -1,3 +1,21 @@
Tue Nov 3 13:16:36 PST 1998 Manish Singh <yosh@gimp.org>
* 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 <yosh@gimp.org>
* Okay, so we need the X11R6 keysyms so programs don't have to

2
gtk/Makefile.am
View File

@@ -331,7 +331,7 @@ LDADDS = \
@x_ldflags@ \
@x_libs@ \
@GLIB_LIBS@ \
-lm -ldl
-lm
testgtk_DEPENDENCIES = $(DEPS)
testinput_DEPENDENCIES = $(DEPS)

3
gtk/gtkdnd.c
View File

@@ -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;
}

8
gtk/gtkmenushell.c
View File

@@ -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);

4
gtk/gtkoptionmenu.c
View File

@@ -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;
}

1
gtk/gtkthemes.h
View File

@@ -24,7 +24,6 @@
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <dlfcn.h>
#include <gdk/gdk.h>
#include <gtk/gtkstyle.h>
#include <gtk/gtkwidget.h>

1
gtk/gtkwidget.c
View File

@@ -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;
}