AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-20 05:50:11 +00:00
Code Issues Projects Releases Wiki Activity

Fix link to PNG home, remove reference to fribidi.

Browse Source 
Tue Dec  5 15:49:31 2000  Owen Taylor  <otaylor@redhat.com>

	* INSTALL: Fix link to PNG home, remove reference
	to fribidi.

	* gdk/x11/gdkevents-x11.c: Fix up for new GMain API.

	* gdk/win32/gdkevents-win32.c: Fix up for new GMain API. (Not
	tested.)

	* gtk/gtkcheckmenuitem.c: Permanently turn on
	always_show_toggle.

	* gtk/gtkclist.c (gtk_clist_get_pixtext): Allow mask to
	be NULL. (Vladimir Klebanov, #26545)

	* gtk/gtkspinbutton.c (gtk_spin_button_insert_text): Fix
	some signed/unsigned comparison problems. (#6510,
	David Kaelbling)

	* gtk/gtkwidget.[ch] (gtk_widget_is_ancestor): Change
	return type to boolean (Oskar Liljeblad, #18648)
This commit is contained in:
Owen Taylor 2000-12-05 20:53:30 +00:00 committed by Owen Taylor
parent 691576eb40
commit a4b2a6a857
15 changed files with 219 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ChangeLog
View File

@ -1,3 +1,26 @@
Tue Dec 5 15:49:31 2000 Owen Taylor <otaylor@redhat.com>
* INSTALL: Fix link to PNG home, remove reference
to fribidi.
* gdk/x11/gdkevents-x11.c: Fix up for new GMain API.
* gdk/win32/gdkevents-win32.c: Fix up for new GMain API. (Not
tested.)
* gtk/gtkcheckmenuitem.c: Permanently turn on
always_show_toggle.
* gtk/gtkclist.c (gtk_clist_get_pixtext): Allow mask to
be NULL. (Vladimir Klebanov, #26545)
* gtk/gtkspinbutton.c (gtk_spin_button_insert_text): Fix
some signed/unsigned comparison problems. (#6510,
David Kaelbling)
* gtk/gtkwidget.[ch] (gtk_widget_is_ancestor): Change
return type to boolean (Oskar Liljeblad, #18648)
2000-12-05 Alexander Larsson <alexl@redhat.com> 2000-12-05 Alexander Larsson <alexl@redhat.com>
* gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new): * gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new):

23
ChangeLog.pre-2-0
View File

@ -1,3 +1,26 @@
Tue Dec 5 15:49:31 2000 Owen Taylor <otaylor@redhat.com>
* INSTALL: Fix link to PNG home, remove reference
to fribidi.
* gdk/x11/gdkevents-x11.c: Fix up for new GMain API.
* gdk/win32/gdkevents-win32.c: Fix up for new GMain API. (Not
tested.)
* gtk/gtkcheckmenuitem.c: Permanently turn on
always_show_toggle.
* gtk/gtkclist.c (gtk_clist_get_pixtext): Allow mask to
be NULL. (Vladimir Klebanov, #26545)
* gtk/gtkspinbutton.c (gtk_spin_button_insert_text): Fix
some signed/unsigned comparison problems. (#6510,
David Kaelbling)
* gtk/gtkwidget.[ch] (gtk_widget_is_ancestor): Change
return type to boolean (Oskar Liljeblad, #18648)
2000-12-05 Alexander Larsson <alexl@redhat.com> 2000-12-05 Alexander Larsson <alexl@redhat.com>
* gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new): * gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new):

23
ChangeLog.pre-2-10
View File

@ -1,3 +1,26 @@
Tue Dec 5 15:49:31 2000 Owen Taylor <otaylor@redhat.com>
* INSTALL: Fix link to PNG home, remove reference
to fribidi.
* gdk/x11/gdkevents-x11.c: Fix up for new GMain API.
* gdk/win32/gdkevents-win32.c: Fix up for new GMain API. (Not
tested.)
* gtk/gtkcheckmenuitem.c: Permanently turn on
always_show_toggle.
* gtk/gtkclist.c (gtk_clist_get_pixtext): Allow mask to
be NULL. (Vladimir Klebanov, #26545)
* gtk/gtkspinbutton.c (gtk_spin_button_insert_text): Fix
some signed/unsigned comparison problems. (#6510,
David Kaelbling)
* gtk/gtkwidget.[ch] (gtk_widget_is_ancestor): Change
return type to boolean (Oskar Liljeblad, #18648)
2000-12-05 Alexander Larsson <alexl@redhat.com> 2000-12-05 Alexander Larsson <alexl@redhat.com>
* gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new): * gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new):

23
ChangeLog.pre-2-2
View File

@ -1,3 +1,26 @@
Tue Dec 5 15:49:31 2000 Owen Taylor <otaylor@redhat.com>
* INSTALL: Fix link to PNG home, remove reference
to fribidi.
* gdk/x11/gdkevents-x11.c: Fix up for new GMain API.
* gdk/win32/gdkevents-win32.c: Fix up for new GMain API. (Not
tested.)
* gtk/gtkcheckmenuitem.c: Permanently turn on
always_show_toggle.
* gtk/gtkclist.c (gtk_clist_get_pixtext): Allow mask to
be NULL. (Vladimir Klebanov, #26545)
* gtk/gtkspinbutton.c (gtk_spin_button_insert_text): Fix
some signed/unsigned comparison problems. (#6510,
David Kaelbling)
* gtk/gtkwidget.[ch] (gtk_widget_is_ancestor): Change
return type to boolean (Oskar Liljeblad, #18648)
2000-12-05 Alexander Larsson <alexl@redhat.com> 2000-12-05 Alexander Larsson <alexl@redhat.com>
* gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new): * gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new):

23
ChangeLog.pre-2-4
View File

@ -1,3 +1,26 @@
Tue Dec 5 15:49:31 2000 Owen Taylor <otaylor@redhat.com>
* INSTALL: Fix link to PNG home, remove reference
to fribidi.
* gdk/x11/gdkevents-x11.c: Fix up for new GMain API.
* gdk/win32/gdkevents-win32.c: Fix up for new GMain API. (Not
tested.)
* gtk/gtkcheckmenuitem.c: Permanently turn on
always_show_toggle.
* gtk/gtkclist.c (gtk_clist_get_pixtext): Allow mask to
be NULL. (Vladimir Klebanov, #26545)
* gtk/gtkspinbutton.c (gtk_spin_button_insert_text): Fix
some signed/unsigned comparison problems. (#6510,
David Kaelbling)
* gtk/gtkwidget.[ch] (gtk_widget_is_ancestor): Change
return type to boolean (Oskar Liljeblad, #18648)
2000-12-05 Alexander Larsson <alexl@redhat.com> 2000-12-05 Alexander Larsson <alexl@redhat.com>
* gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new): * gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new):

23
ChangeLog.pre-2-6
View File

@ -1,3 +1,26 @@
Tue Dec 5 15:49:31 2000 Owen Taylor <otaylor@redhat.com>
* INSTALL: Fix link to PNG home, remove reference
to fribidi.
* gdk/x11/gdkevents-x11.c: Fix up for new GMain API.
* gdk/win32/gdkevents-win32.c: Fix up for new GMain API. (Not
tested.)
* gtk/gtkcheckmenuitem.c: Permanently turn on
always_show_toggle.
* gtk/gtkclist.c (gtk_clist_get_pixtext): Allow mask to
be NULL. (Vladimir Klebanov, #26545)
* gtk/gtkspinbutton.c (gtk_spin_button_insert_text): Fix
some signed/unsigned comparison problems. (#6510,
David Kaelbling)
* gtk/gtkwidget.[ch] (gtk_widget_is_ancestor): Change
return type to boolean (Oskar Liljeblad, #18648)
2000-12-05 Alexander Larsson <alexl@redhat.com> 2000-12-05 Alexander Larsson <alexl@redhat.com>
* gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new): * gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new):

23
ChangeLog.pre-2-8
View File

@ -1,3 +1,26 @@
Tue Dec 5 15:49:31 2000 Owen Taylor <otaylor@redhat.com>
* INSTALL: Fix link to PNG home, remove reference
to fribidi.
* gdk/x11/gdkevents-x11.c: Fix up for new GMain API.
* gdk/win32/gdkevents-win32.c: Fix up for new GMain API. (Not
tested.)
* gtk/gtkcheckmenuitem.c: Permanently turn on
always_show_toggle.
* gtk/gtkclist.c (gtk_clist_get_pixtext): Allow mask to
be NULL. (Vladimir Klebanov, #26545)
* gtk/gtkspinbutton.c (gtk_spin_button_insert_text): Fix
some signed/unsigned comparison problems. (#6510,
David Kaelbling)
* gtk/gtkwidget.[ch] (gtk_widget_is_ancestor): Change
return type to boolean (Oskar Liljeblad, #18648)
2000-12-05 Alexander Larsson <alexl@redhat.com> 2000-12-05 Alexander Larsson <alexl@redhat.com>
* gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new): * gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new):

6
INSTALL
View File

@ -9,16 +9,12 @@ GTK+ requires the following packages:
http://www.pango.org/download.shtml http://www.pango.org/download.shtml
Pango also requires the FriBidi library, available from:
http://imagic.weizmann.ac.il/~dov/freesw/FriBidi/
- The TIFF, PNG, and JPEG image loading libraries. You most - The TIFF, PNG, and JPEG image loading libraries. You most
likely have these installed on your system already. If not likely have these installed on your system already. If not
these libraries are available from: these libraries are available from:
http://www.libtiff.org/ http://www.libtiff.org/
ftp://swrinde.nde.swri.edu/pub/png/src/ http://www.libpng.org/
ftp://ftp.uu.net/graphics/jpeg/ ftp://ftp.uu.net/graphics/jpeg/
If these libraries are not available, the corresponding If these libraries are not available, the corresponding

49
gdk/win32/gdkevents-win32.c
View File

@ -94,16 +94,13 @@ static gboolean gdk_event_translate (GdkEvent *event,
MSG *msg, MSG *msg,
gboolean *ret_val_flagp, gboolean *ret_val_flagp,
gint *ret_valp); gint *ret_valp);
static gboolean gdk_event_prepare (gpointer source_data,
GTimeVal *current_time, static gboolean gdk_event_prepare (GSource *source,
gint *timeout, gint *timeout);
gpointer user_data); static gboolean gdk_event_check (GSource *source);
static gboolean gdk_event_check (gpointer source_data, static gboolean gdk_event_dispatch (GSource *source,
GTimeVal *current_time, GSourceFunc callback,
gpointer user_data); gpointer user_data);
static gboolean gdk_event_dispatch (gpointer source_data,
GTimeVal *current_time,
gpointer user_data);
/* Private variable declarations /* Private variable declarations
*/ */
@ -290,6 +287,7 @@ gdk_window_procedure (HWND hwnd,
void void
gdk_events_init (void) gdk_events_init (void)
{ {
GSource *source;
HRESULT hres; HRESULT hres;
#ifdef USE_TRACKMOUSEEVENT #ifdef USE_TRACKMOUSEEVENT
HMODULE user32, imm32; HMODULE user32, imm32;
@ -307,12 +305,17 @@ gdk_events_init (void)
msh_mousewheel_msg = RegisterWindowMessage ("MSWHEEL_ROLLMSG"); msh_mousewheel_msg = RegisterWindowMessage ("MSWHEEL_ROLLMSG");
GDK_NOTE (EVENTS, g_print ("MSH_MOUSEWHEEL = %#x\n", msh_mousewheel_msg)); GDK_NOTE (EVENTS, g_print ("MSH_MOUSEWHEEL = %#x\n", msh_mousewheel_msg));
g_source_add (GDK_PRIORITY_EVENTS, TRUE, &event_funcs, NULL, NULL, NULL); source = g_source_new (&event_funcs, sizeof (GSource));
g_source_set_priority (source, GDK_PRIORITY_EVENTS);
event_poll_fd.fd = G_WIN32_MSG_HANDLE; event_poll_fd.fd = G_WIN32_MSG_HANDLE;
event_poll_fd.events = G_IO_IN; event_poll_fd.events = G_IO_IN;
g_main_add_poll (&event_poll_fd, GDK_PRIORITY_EVENTS); g_source_add_poll (source, &event_poll_fd);
g_source_set_can_recurse (source, TRUE);
g_source_attach (source, NULL);
g_source_add (GDK_PRIORITY_EVENTS, TRUE, &event_funcs, NULL, NULL, NULL);
hres = CoCreateInstance (&CLSID_CActiveIMM, hres = CoCreateInstance (&CLSID_CActiveIMM,
NULL, NULL,
@ -2836,11 +2839,9 @@ gdk_events_queue (void)
} }
} }
static gboolean static gboolean
gdk_event_prepare (gpointer source_data, gdk_event_prepare (GSource *source,
GTimeVal *current_time, gint *timeout)
gint *timeout,
gpointer user_data)
{ {
MSG msg; MSG msg;
gboolean retval; gboolean retval;
@ -2857,10 +2858,8 @@ gdk_event_prepare (gpointer source_data,
return retval; return retval;
} }
static gboolean static gboolean
gdk_event_check (gpointer source_data, gdk_event_check (GSource *source)
GTimeVal *current_time,
gpointer user_data)
{ {
MSG msg; MSG msg;
gboolean retval; gboolean retval;
@ -2878,10 +2877,10 @@ gdk_event_check (gpointer source_data,
return retval; return retval;
} }
static gboolean static gboolean
gdk_event_dispatch (gpointer source_data, gdk_event_dispatch (GSource *source,
GTimeVal *current_time, GSourceFunc callback,
gpointer user_data) gpointer user_data)
{ {
GdkEvent *event; GdkEvent *event;

46
gdk/x11/gdkevents-x11.c
View File

@ -86,16 +86,12 @@ static Bool gdk_event_get_type (Display *display,
XPointer arg); XPointer arg);
#endif #endif
static gboolean gdk_event_prepare (gpointer source_data, static gboolean gdk_event_prepare (GSource *source,
GTimeVal *current_time, gint *timeout);
gint *timeout, static gboolean gdk_event_check (GSource *source);
gpointer user_data); static gboolean gdk_event_dispatch (GSource *source,
static gboolean gdk_event_check (gpointer source_data, GSourceFunc callback,
GTimeVal *current_time, gpointer user_data);
gpointer user_data);
static gboolean gdk_event_dispatch (gpointer source_data,
GTimeVal *current_time,
gpointer user_data);
GdkFilterReturn gdk_wm_protocols_filter (GdkXEvent *xev, GdkFilterReturn gdk_wm_protocols_filter (GdkXEvent *xev,
GdkEvent *event, GdkEvent *event,
@ -116,7 +112,7 @@ static GSourceFuncs event_funcs = {
gdk_event_prepare, gdk_event_prepare,
gdk_event_check, gdk_event_check,
gdk_event_dispatch, gdk_event_dispatch,
(GDestroyNotify)g_free NULL
}; };
GPollFD event_poll_fd; GPollFD event_poll_fd;
@ -128,16 +124,22 @@ GPollFD event_poll_fd;
void void
gdk_events_init (void) gdk_events_init (void)
{ {
GSource *source;
connection_number = ConnectionNumber (gdk_display); connection_number = ConnectionNumber (gdk_display);
GDK_NOTE (MISC, GDK_NOTE (MISC,
g_message ("connection number: %d", connection_number)); g_message ("connection number: %d", connection_number));
g_source_add (GDK_PRIORITY_EVENTS, TRUE, &event_funcs, NULL, NULL, NULL);
source = g_source_new (&event_funcs, sizeof (GSource));
g_source_set_priority (source, GDK_PRIORITY_EVENTS);
event_poll_fd.fd = connection_number; event_poll_fd.fd = connection_number;
event_poll_fd.events = G_IO_IN; event_poll_fd.events = G_IO_IN;
g_main_add_poll (&event_poll_fd, GDK_PRIORITY_EVENTS); g_source_add_poll (source, &event_poll_fd);
g_source_set_can_recurse (source, TRUE);
g_source_attach (source, NULL);
gdk_add_client_message_filter (gdk_wm_protocols, gdk_add_client_message_filter (gdk_wm_protocols,
gdk_wm_protocols_filter, NULL); gdk_wm_protocols_filter, NULL);
@ -1281,7 +1283,7 @@ gdk_events_queue (void)
w = GDK_WINDOW_XWINDOW (gdk_xim_window); w = GDK_WINDOW_XWINDOW (gdk_xim_window);
break; break;
} }
if (XFilterEvent (&xevent, w)) if (XFilterEvent (&xevent, w))
continue; continue;
#else #else
@ -1313,10 +1315,8 @@ gdk_events_queue (void)
} }
static gboolean static gboolean
gdk_event_prepare (gpointer source_data, gdk_event_prepare (GSource *source,
GTimeVal *current_time, gint *timeout)
gint *timeout,
gpointer user_data)
{ {
gboolean retval; gboolean retval;
@ -1332,9 +1332,7 @@ gdk_event_prepare (gpointer source_data,
} }
static gboolean static gboolean
gdk_event_check (gpointer source_data, gdk_event_check (GSource *source)
GTimeVal *current_time,
gpointer user_data)
{ {
gboolean retval; gboolean retval;
@ -1351,9 +1349,9 @@ gdk_event_check (gpointer source_data,
} }
static gboolean static gboolean
gdk_event_dispatch (gpointer source_data, gdk_event_dispatch (GSource *source,
GTimeVal *current_time, GSourceFunc callback,
gpointer user_data) gpointer user_data)
{ {
GdkEvent *event; GdkEvent *event;

6
gtk/gtkcheckmenuitem.c
View File

@ -162,8 +162,10 @@ gtk_check_menu_item_set_show_toggle (GtkCheckMenuItem *menu_item,
{ {
g_return_if_fail (menu_item != NULL); g_return_if_fail (menu_item != NULL);
g_return_if_fail (GTK_IS_CHECK_MENU_ITEM (menu_item)); g_return_if_fail (GTK_IS_CHECK_MENU_ITEM (menu_item));
#if 0
menu_item->always_show_toggle = always != FALSE; menu_item->always_show_toggle = always != FALSE;
#endif
} }
void void
@ -176,7 +178,7 @@ static void
gtk_check_menu_item_init (GtkCheckMenuItem *check_menu_item) gtk_check_menu_item_init (GtkCheckMenuItem *check_menu_item)
{ {
check_menu_item->active = FALSE; check_menu_item->active = FALSE;
check_menu_item->always_show_toggle = FALSE; check_menu_item->always_show_toggle = TRUE;
} }
static gint static gint

3
gtk/gtkclist.c
View File

@ -2364,7 +2364,8 @@ gtk_clist_get_pixtext (GtkCList *clist,
*pixmap = GTK_CELL_PIXTEXT (clist_row->cell[column])->pixmap; *pixmap = GTK_CELL_PIXTEXT (clist_row->cell[column])->pixmap;
/* mask can be NULL */ /* mask can be NULL */
*mask = GTK_CELL_PIXTEXT (clist_row->cell[column])->mask; if (mask)
*mask = GTK_CELL_PIXTEXT (clist_row->cell[column])->mask;
return 1; return 1;
} }

6
gtk/gtkspinbutton.c
View File

@ -1209,7 +1209,7 @@ gtk_spin_button_insert_text (GtkEntry *entry,
gint i; gint i;
GdkWChar pos_sign; GdkWChar pos_sign;
GdkWChar neg_sign; GdkWChar neg_sign;
guint entry_length; gint entry_length;
entry_length = entry->text_length; entry_length = entry->text_length;
@ -1244,7 +1244,7 @@ gtk_spin_button_insert_text (GtkEntry *entry,
} }
if (dotpos > -1 && *position > dotpos && if (dotpos > -1 && *position > dotpos &&
spin->digits - entry_length (gint)spin->digits - entry_length
+ dotpos - new_text_length + 1 < 0) + dotpos - new_text_length + 1 < 0)
return; return;
@ -1260,7 +1260,7 @@ gtk_spin_button_insert_text (GtkEntry *entry,
{ {
if (!spin->digits || dotpos > -1 || if (!spin->digits || dotpos > -1 ||
(new_text_length - 1 - i + entry_length (new_text_length - 1 - i + entry_length
- *position > spin->digits)) - *position > (gint)spin->digits))
return; return;
dotpos = *position + i; dotpos = *position + i;
} }

2
gtk/gtkwidget.c
View File

@ -4294,7 +4294,7 @@ gtk_widget_get_pointer (GtkWidget *widget,
* results: * results:
*****************************************/ *****************************************/
gint gboolean
gtk_widget_is_ancestor (GtkWidget *widget, gtk_widget_is_ancestor (GtkWidget *widget,
GtkWidget *ancestor) GtkWidget *ancestor)
{ {

2
gtk/gtkwidget.h
View File

@ -546,7 +546,7 @@ void gtk_widget_get_pointer (GtkWidget *widget,
gint *x, gint *x,
gint *y); gint *y);
gint gtk_widget_is_ancestor (GtkWidget *widget, gboolean gtk_widget_is_ancestor (GtkWidget *widget,
GtkWidget *ancestor); GtkWidget *ancestor);
/* Hide widget and return TRUE. /* Hide widget and return TRUE.