Commit 2e70f892 authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist

Add gdkkeys.

2000-12-15  Tor Lillqvist  <tml@iki.fi>

	* gdk/makefile.{mingw.in,msc} (gdk_OBJECTS): Add gdkkeys.

	* gtk/gtk.def
	* gdk/gdk.def: Update.

	* gdk/win32/gdkmain-win32.c
	* gdk/win32/gdkkeys-win32.c: New file. Move some functions from
	gdkmain-win32.c here.

	* gdk/win32/makefile.mingw.in (all): No need to make
	gdk-win32res.o here, the makefile one step up will call us to make
	it.

	* gdk/win32/makefile.{mingw.in,msc} (gdk_win32_OBJECTS): Add
	gdkkeys-win32.

	* gdk/win32/gdkcolor-win32.c: Silence gcc -Wall.

	* gdk/win32/gdkevents-win32.c (gdk_events_init): Remove leftover
	call to g_source_add().

	* gdk/win32/gdkgc-win32.c (BitmapToRegion): Plug memory
	leak. Thanks to Andreas Kemnade.
parent ea099b24
2000-12-15 Tor Lillqvist <tml@iki.fi>
* gdk/makefile.{mingw.in,msc} (gdk_OBJECTS): Add gdkkeys.
* gtk/gtk.def
* gdk/gdk.def: Update.
* gdk/win32/gdkmain-win32.c
* gdk/win32/gdkkeys-win32.c: New file. Move some functions from
gdkmain-win32.c here.
* gdk/win32/makefile.mingw.in (all): No need to make
gdk-win32res.o here, the makefile one step up will call us to make
it.
* gdk/win32/makefile.{mingw.in,msc} (gdk_win32_OBJECTS): Add
gdkkeys-win32.
* gdk/win32/gdkcolor-win32.c: Silence gcc -Wall.
* gdk/win32/gdkevents-win32.c (gdk_events_init): Remove leftover
call to g_source_add().
* gdk/win32/gdkgc-win32.c (BitmapToRegion): Plug memory
leak. Thanks to Andreas Kemnade.
2000-12-13 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.h: Remove double _ in front of some functions
......
2000-12-15 Tor Lillqvist <tml@iki.fi>
* gdk/makefile.{mingw.in,msc} (gdk_OBJECTS): Add gdkkeys.
* gtk/gtk.def
* gdk/gdk.def: Update.
* gdk/win32/gdkmain-win32.c
* gdk/win32/gdkkeys-win32.c: New file. Move some functions from
gdkmain-win32.c here.
* gdk/win32/makefile.mingw.in (all): No need to make
gdk-win32res.o here, the makefile one step up will call us to make
it.
* gdk/win32/makefile.{mingw.in,msc} (gdk_win32_OBJECTS): Add
gdkkeys-win32.
* gdk/win32/gdkcolor-win32.c: Silence gcc -Wall.
* gdk/win32/gdkevents-win32.c (gdk_events_init): Remove leftover
call to g_source_add().
* gdk/win32/gdkgc-win32.c (BitmapToRegion): Plug memory
leak. Thanks to Andreas Kemnade.
2000-12-13 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.h: Remove double _ in front of some functions
......
2000-12-15 Tor Lillqvist <tml@iki.fi>
* gdk/makefile.{mingw.in,msc} (gdk_OBJECTS): Add gdkkeys.
* gtk/gtk.def
* gdk/gdk.def: Update.
* gdk/win32/gdkmain-win32.c
* gdk/win32/gdkkeys-win32.c: New file. Move some functions from
gdkmain-win32.c here.
* gdk/win32/makefile.mingw.in (all): No need to make
gdk-win32res.o here, the makefile one step up will call us to make
it.
* gdk/win32/makefile.{mingw.in,msc} (gdk_win32_OBJECTS): Add
gdkkeys-win32.
* gdk/win32/gdkcolor-win32.c: Silence gcc -Wall.
* gdk/win32/gdkevents-win32.c (gdk_events_init): Remove leftover
call to g_source_add().
* gdk/win32/gdkgc-win32.c (BitmapToRegion): Plug memory
leak. Thanks to Andreas Kemnade.
2000-12-13 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.h: Remove double _ in front of some functions
......
2000-12-15 Tor Lillqvist <tml@iki.fi>
* gdk/makefile.{mingw.in,msc} (gdk_OBJECTS): Add gdkkeys.
* gtk/gtk.def
* gdk/gdk.def: Update.
* gdk/win32/gdkmain-win32.c
* gdk/win32/gdkkeys-win32.c: New file. Move some functions from
gdkmain-win32.c here.
* gdk/win32/makefile.mingw.in (all): No need to make
gdk-win32res.o here, the makefile one step up will call us to make
it.
* gdk/win32/makefile.{mingw.in,msc} (gdk_win32_OBJECTS): Add
gdkkeys-win32.
* gdk/win32/gdkcolor-win32.c: Silence gcc -Wall.
* gdk/win32/gdkevents-win32.c (gdk_events_init): Remove leftover
call to g_source_add().
* gdk/win32/gdkgc-win32.c (BitmapToRegion): Plug memory
leak. Thanks to Andreas Kemnade.
2000-12-13 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.h: Remove double _ in front of some functions
......
2000-12-15 Tor Lillqvist <tml@iki.fi>
* gdk/makefile.{mingw.in,msc} (gdk_OBJECTS): Add gdkkeys.
* gtk/gtk.def
* gdk/gdk.def: Update.
* gdk/win32/gdkmain-win32.c
* gdk/win32/gdkkeys-win32.c: New file. Move some functions from
gdkmain-win32.c here.
* gdk/win32/makefile.mingw.in (all): No need to make
gdk-win32res.o here, the makefile one step up will call us to make
it.
* gdk/win32/makefile.{mingw.in,msc} (gdk_win32_OBJECTS): Add
gdkkeys-win32.
* gdk/win32/gdkcolor-win32.c: Silence gcc -Wall.
* gdk/win32/gdkevents-win32.c (gdk_events_init): Remove leftover
call to g_source_add().
* gdk/win32/gdkgc-win32.c (BitmapToRegion): Plug memory
leak. Thanks to Andreas Kemnade.
2000-12-13 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.h: Remove double _ in front of some functions
......
2000-12-15 Tor Lillqvist <tml@iki.fi>
* gdk/makefile.{mingw.in,msc} (gdk_OBJECTS): Add gdkkeys.
* gtk/gtk.def
* gdk/gdk.def: Update.
* gdk/win32/gdkmain-win32.c
* gdk/win32/gdkkeys-win32.c: New file. Move some functions from
gdkmain-win32.c here.
* gdk/win32/makefile.mingw.in (all): No need to make
gdk-win32res.o here, the makefile one step up will call us to make
it.
* gdk/win32/makefile.{mingw.in,msc} (gdk_win32_OBJECTS): Add
gdkkeys-win32.
* gdk/win32/gdkcolor-win32.c: Silence gcc -Wall.
* gdk/win32/gdkevents-win32.c (gdk_events_init): Remove leftover
call to g_source_add().
* gdk/win32/gdkgc-win32.c (BitmapToRegion): Plug memory
leak. Thanks to Andreas Kemnade.
2000-12-13 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.h: Remove double _ in front of some functions
......
2000-12-15 Tor Lillqvist <tml@iki.fi>
* gdk/makefile.{mingw.in,msc} (gdk_OBJECTS): Add gdkkeys.
* gtk/gtk.def
* gdk/gdk.def: Update.
* gdk/win32/gdkmain-win32.c
* gdk/win32/gdkkeys-win32.c: New file. Move some functions from
gdkmain-win32.c here.
* gdk/win32/makefile.mingw.in (all): No need to make
gdk-win32res.o here, the makefile one step up will call us to make
it.
* gdk/win32/makefile.{mingw.in,msc} (gdk_win32_OBJECTS): Add
gdkkeys-win32.
* gdk/win32/gdkcolor-win32.c: Silence gcc -Wall.
* gdk/win32/gdkevents-win32.c (gdk_events_init): Remove leftover
call to g_source_add().
* gdk/win32/gdkgc-win32.c (BitmapToRegion): Plug memory
leak. Thanks to Andreas Kemnade.
2000-12-13 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.h: Remove double _ in front of some functions
......
......@@ -202,6 +202,12 @@ EXPORTS
gdk_key_repeat_restore
gdk_keyboard_grab
gdk_keyboard_ungrab
gdk_keymap_get_default
gdk_keymap_get_entries_for_keycode
gdk_keymap_get_entries_for_keyval
gdk_keymap_get_type
gdk_keymap_lookup_key
gdk_keymap_translate_keyboard_state
gdk_keyval_convert_case
gdk_keyval_from_name
gdk_keyval_is_lower
......
......@@ -37,6 +37,7 @@ gdk_OBJECTS = \
gdkgc.o \
gdkglobals.o \
gdkimage.o \
gdkkeys.o \
gdkkeyuni.o \
gdkpango.o \
gdkpixbuf-drawable.o \
......
......@@ -56,6 +56,7 @@ gdk_OBJECTS = \
gdkgc.obj \
gdkglobals.obj \
gdkimage.obj \
gdkkeys.obj \
gdkkeyuni.obj \
gdkpango.obj \
gdkpixmap.obj \
......
......@@ -254,7 +254,7 @@ terms specified in this license.
static int
alloc_color(Colormap colormap,
XColor *color,
gulong *pixelp)
guint *pixelp)
{
PALETTEENTRY entry, closeEntry;
unsigned int i;
......@@ -2272,7 +2272,7 @@ gdk_win32_color_to_string (const GdkColor *color)
{
static char buf[100];
sprintf (buf, "(%.04x,%.04x,%.04x):%.06lx",
sprintf (buf, "(%.04x,%.04x,%.04x):%.06x",
color->red, color->green, color->blue, color->pixel);
return buf;
......
......@@ -315,8 +315,6 @@ gdk_events_init (void)
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,
NULL,
CLSCTX_ALL,
......
......@@ -1464,6 +1464,7 @@ BitmapToRegion (HBITMAP hBmp)
hRgn = h;
/* Clean up*/
g_free (pData);
SelectObject(hMemDC, holdBmp);
DeleteObject (hbm8);
DeleteDC (hMemDC);
......
This diff is collapsed.
This diff is collapsed.
......@@ -23,7 +23,6 @@ all: \
../../config.h \
../gdkconfig.h \
libgdk-win32.a \
gdk-win32res.o \
libwntab32x.a
gdk_win32_OBJECTS = \
......@@ -41,6 +40,7 @@ gdk_win32_OBJECTS = \
gdkimage-win32.o \
gdkinput.o \
gdkinput-win32.o \
gdkkeys-win32.o \
gdkmain-win32.o \
gdkpango-win32.o \
gdkpixmap-win32.o \
......
......@@ -49,6 +49,7 @@ gdk_win32_OBJECTS = \
gdkimage-win32.obj \
gdkinput.obj \
gdkinput-win32.obj \
gdkkeys-win32.obj \
gdkmain-win32.obj \
gdkpango-win32.obj \
gdkpixmap-win32.obj \
......
......@@ -254,7 +254,6 @@ EXPORTS
gtk_clist_column_titles_passive
gtk_clist_column_titles_show
gtk_clist_columns_autosize
gtk_clist_construct
gtk_clist_find_row_from_data
gtk_clist_freeze
gtk_clist_get_cell_style
......@@ -371,7 +370,6 @@ EXPORTS
gtk_ctree_collapse
gtk_ctree_collapse_recursive
gtk_ctree_collapse_to_depth
gtk_ctree_construct
gtk_ctree_expand
gtk_ctree_expand_recursive
gtk_ctree_expand_to_depth
......@@ -847,25 +845,13 @@ EXPORTS
gtk_notebook_set_tab_pos
gtk_notebook_set_tab_vborder
gtk_object_add_arg_type
gtk_object_arg_get
gtk_object_arg_get_info
gtk_object_arg_set
gtk_object_args_collect
gtk_object_class_add_signals
gtk_object_class_user_signal_new
gtk_object_class_user_signal_newv
gtk_object_constructed
gtk_object_default_construct
gtk_object_destroy
gtk_object_get
gtk_object_get_data
gtk_object_get_data_by_id
gtk_object_get_type
gtk_object_get_user_data
gtk_object_getv
gtk_object_new
gtk_object_newv
gtk_object_query_args
gtk_object_ref
gtk_object_remove_data
gtk_object_remove_data_by_id
......@@ -877,7 +863,6 @@ EXPORTS
gtk_object_set_data_by_id_full
gtk_object_set_data_full
gtk_object_set_user_data
gtk_object_setv
gtk_object_sink
gtk_object_unref
gtk_object_weakref
......@@ -1189,6 +1174,7 @@ EXPORTS
gtk_text_get_point
gtk_text_get_type
gtk_text_insert
gtk_text_iter_backward_char
gtk_text_iter_backward_chars
gtk_text_iter_backward_find_char
gtk_text_iter_backward_search
......@@ -1197,6 +1183,7 @@ EXPORTS
gtk_text_iter_compare
gtk_text_iter_ends_tag
gtk_text_iter_equal
gtk_text_iter_forward_char
gtk_text_iter_forward_chars
gtk_text_iter_forward_find_char
gtk_text_iter_forward_line
......@@ -1209,8 +1196,6 @@ EXPORTS
gtk_text_iter_get_toggled_tags
gtk_text_iter_in_range
gtk_text_iter_is_last
gtk_text_iter_next_char
gtk_text_iter_prev_char
gtk_text_iter_reorder
gtk_text_iter_spew
gtk_text_iter_toggles_tag
......@@ -1378,7 +1363,6 @@ EXPORTS
gtk_widget_draw_focus
gtk_widget_ensure_style
gtk_widget_event
gtk_widget_get
gtk_widget_get_ancestor
gtk_widget_get_child_requisition
gtk_widget_get_colormap
......@@ -1399,7 +1383,6 @@ EXPORTS
gtk_widget_get_toplevel
gtk_widget_get_type
gtk_widget_get_visual
gtk_widget_getv
gtk_widget_grab_default
gtk_widget_grab_focus
gtk_widget_hide
......@@ -1416,7 +1399,6 @@ EXPORTS
gtk_widget_modify_style
gtk_widget_modify_text
gtk_widget_new
gtk_widget_newv
gtk_widget_path
gtk_widget_pop_colormap
gtk_widget_pop_composite_child
......@@ -1459,7 +1441,6 @@ EXPORTS
gtk_widget_set_style
gtk_widget_set_uposition
gtk_widget_set_usize
gtk_widget_setv
gtk_widget_shape_combine_mask
gtk_widget_show
gtk_widget_show_all
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment