mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-12 20:00:09 +00:00
Do include docs. (EXTRA_DIST): Include config.h.win32.
2002-11-03 Tor Lillqvist <tml@iki.fi> * Makefile.am (SUBDIRS): Do include docs. (EXTRA_DIST): Include config.h.win32. * configure.in: Must call AM_CONDITIONAL for XINPUT_GXI and XINPUT_XFREE (setting them to falce) also in the win32 branch. * gdk/gdkdnd.h: Fix lint, put the "extra tokens" inside comment after the #endif. * gdk/win32/gdkdrawable-win32.c: A couple of logging fixes. * gdk/win32/gdkevents-win32.c (gdk_event_translate): WM_SYSKEYDOWN, WM_SYSKEYUP: Need to handle F10 specially here in order to be able to handle it normally in the application. * gdk/win32/gdkpixmap-win32.c: Minor logging changes. * gdk/win32/gdkwindow-win32.c (gdk_window_get_geometry): Return the window's coordintes relative to the *parent*. * gtk/gtkmain.c (gtk_init_check): Don't need to call bind_textdomain_codeset() for glib20, GLib handles that itself.
This commit is contained in:
Tor Lillqvist
Tor Lillqvist
parent
f61dffae75
commit
5b4a8842e7
25
ChangeLog
25
ChangeLog
@ -1,3 +1,28 @@
|
||||
2002-11-03 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* Makefile.am (SUBDIRS): Do include docs.
|
||||
(EXTRA_DIST): Include config.h.win32.
|
||||
|
||||
* configure.in: Must call AM_CONDITIONAL for XINPUT_GXI and
|
||||
XINPUT_XFREE (setting them to falce) also in the win32 branch.
|
||||
|
||||
* gdk/gdkdnd.h: Fix lint, put the "extra tokens" inside comment
|
||||
after the #endif.
|
||||
|
||||
* gdk/win32/gdkdrawable-win32.c: A couple of logging fixes.
|
||||
|
||||
* gdk/win32/gdkevents-win32.c (gdk_event_translate):
|
||||
WM_SYSKEYDOWN, WM_SYSKEYUP: Need to handle F10 specially here in
|
||||
order to be able to handle it normally in the application.
|
||||
|
||||
* gdk/win32/gdkpixmap-win32.c: Minor logging changes.
|
||||
|
||||
* gdk/win32/gdkwindow-win32.c (gdk_window_get_geometry): Return
|
||||
the window's coordintes relative to the *parent*.
|
||||
|
||||
* gtk/gtkmain.c (gtk_init_check): Don't need to call
|
||||
bind_textdomain_codeset() for glib20, GLib handles that itself.
|
||||
|
||||
2002-10-04 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): If the font
|
||||
|
||||
@ -1,3 +1,28 @@
|
||||
2002-11-03 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* Makefile.am (SUBDIRS): Do include docs.
|
||||
(EXTRA_DIST): Include config.h.win32.
|
||||
|
||||
* configure.in: Must call AM_CONDITIONAL for XINPUT_GXI and
|
||||
XINPUT_XFREE (setting them to falce) also in the win32 branch.
|
||||
|
||||
* gdk/gdkdnd.h: Fix lint, put the "extra tokens" inside comment
|
||||
after the #endif.
|
||||
|
||||
* gdk/win32/gdkdrawable-win32.c: A couple of logging fixes.
|
||||
|
||||
* gdk/win32/gdkevents-win32.c (gdk_event_translate):
|
||||
WM_SYSKEYDOWN, WM_SYSKEYUP: Need to handle F10 specially here in
|
||||
order to be able to handle it normally in the application.
|
||||
|
||||
* gdk/win32/gdkpixmap-win32.c: Minor logging changes.
|
||||
|
||||
* gdk/win32/gdkwindow-win32.c (gdk_window_get_geometry): Return
|
||||
the window's coordintes relative to the *parent*.
|
||||
|
||||
* gtk/gtkmain.c (gtk_init_check): Don't need to call
|
||||
bind_textdomain_codeset() for glib20, GLib handles that itself.
|
||||
|
||||
2002-10-04 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): If the font
|
||||
|
||||
@ -1,3 +1,28 @@
|
||||
2002-11-03 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* Makefile.am (SUBDIRS): Do include docs.
|
||||
(EXTRA_DIST): Include config.h.win32.
|
||||
|
||||
* configure.in: Must call AM_CONDITIONAL for XINPUT_GXI and
|
||||
XINPUT_XFREE (setting them to falce) also in the win32 branch.
|
||||
|
||||
* gdk/gdkdnd.h: Fix lint, put the "extra tokens" inside comment
|
||||
after the #endif.
|
||||
|
||||
* gdk/win32/gdkdrawable-win32.c: A couple of logging fixes.
|
||||
|
||||
* gdk/win32/gdkevents-win32.c (gdk_event_translate):
|
||||
WM_SYSKEYDOWN, WM_SYSKEYUP: Need to handle F10 specially here in
|
||||
order to be able to handle it normally in the application.
|
||||
|
||||
* gdk/win32/gdkpixmap-win32.c: Minor logging changes.
|
||||
|
||||
* gdk/win32/gdkwindow-win32.c (gdk_window_get_geometry): Return
|
||||
the window's coordintes relative to the *parent*.
|
||||
|
||||
* gtk/gtkmain.c (gtk_init_check): Don't need to call
|
||||
bind_textdomain_codeset() for glib20, GLib handles that itself.
|
||||
|
||||
2002-10-04 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): If the font
|
||||
|
||||
@ -1,3 +1,28 @@
|
||||
2002-11-03 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* Makefile.am (SUBDIRS): Do include docs.
|
||||
(EXTRA_DIST): Include config.h.win32.
|
||||
|
||||
* configure.in: Must call AM_CONDITIONAL for XINPUT_GXI and
|
||||
XINPUT_XFREE (setting them to falce) also in the win32 branch.
|
||||
|
||||
* gdk/gdkdnd.h: Fix lint, put the "extra tokens" inside comment
|
||||
after the #endif.
|
||||
|
||||
* gdk/win32/gdkdrawable-win32.c: A couple of logging fixes.
|
||||
|
||||
* gdk/win32/gdkevents-win32.c (gdk_event_translate):
|
||||
WM_SYSKEYDOWN, WM_SYSKEYUP: Need to handle F10 specially here in
|
||||
order to be able to handle it normally in the application.
|
||||
|
||||
* gdk/win32/gdkpixmap-win32.c: Minor logging changes.
|
||||
|
||||
* gdk/win32/gdkwindow-win32.c (gdk_window_get_geometry): Return
|
||||
the window's coordintes relative to the *parent*.
|
||||
|
||||
* gtk/gtkmain.c (gtk_init_check): Don't need to call
|
||||
bind_textdomain_codeset() for glib20, GLib handles that itself.
|
||||
|
||||
2002-10-04 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): If the font
|
||||
|
||||
@ -1,3 +1,28 @@
|
||||
2002-11-03 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* Makefile.am (SUBDIRS): Do include docs.
|
||||
(EXTRA_DIST): Include config.h.win32.
|
||||
|
||||
* configure.in: Must call AM_CONDITIONAL for XINPUT_GXI and
|
||||
XINPUT_XFREE (setting them to falce) also in the win32 branch.
|
||||
|
||||
* gdk/gdkdnd.h: Fix lint, put the "extra tokens" inside comment
|
||||
after the #endif.
|
||||
|
||||
* gdk/win32/gdkdrawable-win32.c: A couple of logging fixes.
|
||||
|
||||
* gdk/win32/gdkevents-win32.c (gdk_event_translate):
|
||||
WM_SYSKEYDOWN, WM_SYSKEYUP: Need to handle F10 specially here in
|
||||
order to be able to handle it normally in the application.
|
||||
|
||||
* gdk/win32/gdkpixmap-win32.c: Minor logging changes.
|
||||
|
||||
* gdk/win32/gdkwindow-win32.c (gdk_window_get_geometry): Return
|
||||
the window's coordintes relative to the *parent*.
|
||||
|
||||
* gtk/gtkmain.c (gtk_init_check): Don't need to call
|
||||
bind_textdomain_codeset() for glib20, GLib handles that itself.
|
||||
|
||||
2002-10-04 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): If the font
|
||||
|
||||
@ -1,3 +1,28 @@
|
||||
2002-11-03 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* Makefile.am (SUBDIRS): Do include docs.
|
||||
(EXTRA_DIST): Include config.h.win32.
|
||||
|
||||
* configure.in: Must call AM_CONDITIONAL for XINPUT_GXI and
|
||||
XINPUT_XFREE (setting them to falce) also in the win32 branch.
|
||||
|
||||
* gdk/gdkdnd.h: Fix lint, put the "extra tokens" inside comment
|
||||
after the #endif.
|
||||
|
||||
* gdk/win32/gdkdrawable-win32.c: A couple of logging fixes.
|
||||
|
||||
* gdk/win32/gdkevents-win32.c (gdk_event_translate):
|
||||
WM_SYSKEYDOWN, WM_SYSKEYUP: Need to handle F10 specially here in
|
||||
order to be able to handle it normally in the application.
|
||||
|
||||
* gdk/win32/gdkpixmap-win32.c: Minor logging changes.
|
||||
|
||||
* gdk/win32/gdkwindow-win32.c (gdk_window_get_geometry): Return
|
||||
the window's coordintes relative to the *parent*.
|
||||
|
||||
* gtk/gtkmain.c (gtk_init_check): Don't need to call
|
||||
bind_textdomain_codeset() for glib20, GLib handles that itself.
|
||||
|
||||
2002-10-04 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): If the font
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
## Makefile.am for GTK+
|
||||
|
||||
SRC_SUBDIRS = gdk gtk
|
||||
SUBDIRS = po $(SRC_SUBDIRS) build # docs
|
||||
SUBDIRS = po $(SRC_SUBDIRS) build docs
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA= gdk-1.3-win32-production.pc gtk+-1.3-win32-production.pc
|
||||
@ -18,6 +18,7 @@ EXTRA_DIST = \
|
||||
ChangeLog.pre-1-0 \
|
||||
README.cvs-commits \
|
||||
README.win32 \
|
||||
config.h.win32 \
|
||||
gtk+-1.3-win32-production.pc.in \
|
||||
gdk-1.3-win32-production.pc.in \
|
||||
gtk+-zip.sh \
|
||||
|
||||
@ -357,6 +357,8 @@ AM_CONDITIONAL(HAVE_WINTAB, test x$have_wintab = xyes)
|
||||
# in case somebody wants to compare
|
||||
|
||||
if test "$platform_win32" = "yes"; then
|
||||
AM_CONDITIONAL(XINPUT_GXI, false)
|
||||
AM_CONDITIONAL(XINPUT_XFREE, false)
|
||||
gdktarget=win32
|
||||
x_libs="-lgdi32 -luser32 -limm32 -lshell32 -lole32 -luuid"
|
||||
if test x$have_wintab = xyes; then
|
||||
@ -367,7 +369,7 @@ if test "$platform_win32" = "yes"; then
|
||||
if test x$enable_ole2_dnd = xyes; then
|
||||
AC_DEFINE(USE_OLE2_DND)
|
||||
fi
|
||||
else
|
||||
else # ends at comment "!platform_win32"
|
||||
gdktarget=x11
|
||||
# Find the X11 include and library directories
|
||||
AC_PATH_X
|
||||
|
||||
@ -96,4 +96,4 @@ void gdk_drag_abort (GdkDragContext *context,
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif __GDK_DND_H__
|
||||
#endif /* __GDK_DND_H__ */
|
||||
|
||||
@ -599,7 +599,7 @@ gdk_win32_draw_text (GdkDrawable *drawable,
|
||||
|
||||
arg.hdc = gdk_gc_predraw (drawable, gc_private, GDK_GC_FOREGROUND|GDK_GC_FONT);
|
||||
|
||||
GDK_NOTE (MISC, g_print ("gdk_draw_text: %p (%d,%d) \"%.*s\" (len %d)\n",
|
||||
GDK_NOTE (MISC, g_print ("gdk_win32_draw_text: %p (%d,%d) \"%.*s\" (len %d)\n",
|
||||
GDK_DRAWABLE_XID (drawable),
|
||||
x, y,
|
||||
(text_length > 10 ? 10 : text_length),
|
||||
@ -607,7 +607,7 @@ gdk_win32_draw_text (GdkDrawable *drawable,
|
||||
|
||||
wcstr = g_new (wchar_t, text_length);
|
||||
if ((wlen = gdk_nmbstowchar_ts (wcstr, text, text_length, text_length)) == -1)
|
||||
g_warning ("gdk_draw_text: gdk_nmbstowchar_ts failed");
|
||||
g_warning ("gdk_win32_draw_text: gdk_nmbstowchar_ts failed");
|
||||
else
|
||||
{
|
||||
arg.total_len = wlen;
|
||||
|
||||
@ -3571,7 +3571,7 @@ gdk_event_translate (GdkEvent *event,
|
||||
}
|
||||
|
||||
/* If posted without us having keyboard focus, ignore */
|
||||
if (!(xevent->lParam & 0x20000000))
|
||||
if (xevent->wParam != VK_F10 && !(HIWORD (xevent->lParam) & KF_ALTDOWN))
|
||||
break;
|
||||
#if 0
|
||||
/* don't generate events for just the Alt key */
|
||||
|
||||
@ -25,6 +25,8 @@
|
||||
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
|
||||
*/
|
||||
|
||||
/* #define VERY_VERBOSE */
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
@ -683,7 +685,7 @@ gdk_xpm_destroy_notify (gpointer data)
|
||||
g_free (info);
|
||||
}
|
||||
|
||||
#if 0
|
||||
#ifdef VERY_VERBOSE
|
||||
|
||||
/* Very verbose pixmap dumping, both to screen and with g_print() */
|
||||
|
||||
@ -951,8 +953,10 @@ _gdk_pixmap_create_from_xpm (GdkWindow *window,
|
||||
gdk_draw_line (*mask, gc, cnt, ycnt, xcnt - 1, ycnt);
|
||||
}
|
||||
|
||||
#if 0
|
||||
GDK_NOTE (PIXMAP, showpixmap (*mask));
|
||||
#ifdef VERY_VERBOSE
|
||||
GDK_NOTE (PIXMAP, (mask ? (g_print ("mask:\n"),
|
||||
showpixmap (*mask)) :
|
||||
(void) 0));
|
||||
#endif
|
||||
error:
|
||||
|
||||
@ -963,8 +967,9 @@ _gdk_pixmap_create_from_xpm (GdkWindow *window,
|
||||
{
|
||||
pixmap = ((GdkImagePrivateWin32 *) image)->pixmap;
|
||||
|
||||
#if 0
|
||||
GDK_NOTE (PIXMAP, showpixmap (pixmap));
|
||||
#ifdef VERY_VERBOSE
|
||||
GDK_NOTE (PIXMAP, (g_print ("pixmap:\n"),
|
||||
showpixmap (pixmap)));
|
||||
#endif
|
||||
if (color_info)
|
||||
gdk_drawable_set_data (pixmap, "gdk-xpm", color_info,
|
||||
|
||||
@ -141,7 +141,7 @@ gdk_window_init (void)
|
||||
guint width;
|
||||
guint height;
|
||||
|
||||
SystemParametersInfo(SPI_GETWORKAREA, 0, &r, 0);
|
||||
SystemParametersInfo (SPI_GETWORKAREA, 0, &r, 0);
|
||||
width = r.right - r.left;
|
||||
height = r.bottom - r.top;
|
||||
|
||||
@ -1577,6 +1577,12 @@ gdk_window_get_geometry (GdkWindow *window,
|
||||
if (!GetClientRect (GDK_DRAWABLE_XID (window), &rect))
|
||||
WIN32_API_FAILED ("GetClientRect");
|
||||
|
||||
if (window != _gdk_parent_root)
|
||||
{
|
||||
ClientToScreen (GDK_WINDOW_HWND (window), &rect);
|
||||
ScreenToClient (GDK_WINDOW_HWND (gdk_window_get_parent (window)), &rect);
|
||||
}
|
||||
|
||||
if (x)
|
||||
*x = rect.left;
|
||||
if (y)
|
||||
|
||||
@ -473,7 +473,6 @@ gtk_init_check (int *argc,
|
||||
bindtextdomain("gtk+", GTK_LOCALEDIR);
|
||||
#if defined(HAVE_BIND_TEXTDOMAIN_CODESET) && defined(GDK_USE_UTF8_MBS)
|
||||
bind_textdomain_codeset ("gtk+", "UTF-8");
|
||||
bind_textdomain_codeset ("glib20", "UTF-8");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user