Commit 0cc2a00d authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist

Remove the #ifndef USE_DISPATCHMESSAGE sections, we do want to use

2000-03-17  Tor Lillqvist  <tml@iki.fi>

* gdk/win32/gdkevents-win32.c: Remove the #ifndef
USE_DISPATCHMESSAGE sections, we do want to use DispatchMessage.

* gdk/win32/gdkfont-win32.c
* gdk/win32/gdkproperty-win32.c
* gdk/win32/gdkselection-win32.c
* gdk/win32/gdkwindow-win32.c: Add const to some arguments that are
now declared such.
parent 2cc21d52
2000-03-17 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c: Remove the #ifndef
USE_DISPATCHMESSAGE sections, we do want to use DispatchMessage.
* gdk/win32/gdkfont-win32.c
* gdk/win32/gdkproperty-win32.c
* gdk/win32/gdkselection-win32.c
* gdk/win32/gdkwindow-win32.c: Add const to some arguments that are
now declared such.
Wed Mar 15 02:59:38 PST 2000 Manish Singh <yosh@gimp.org>
* gtk/gtkvpaned.c: removed stray gutter_size reference, a 1.2 relic
......
2000-03-17 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c: Remove the #ifndef
USE_DISPATCHMESSAGE sections, we do want to use DispatchMessage.
* gdk/win32/gdkfont-win32.c
* gdk/win32/gdkproperty-win32.c
* gdk/win32/gdkselection-win32.c
* gdk/win32/gdkwindow-win32.c: Add const to some arguments that are
now declared such.
Wed Mar 15 02:59:38 PST 2000 Manish Singh <yosh@gimp.org>
* gtk/gtkvpaned.c: removed stray gutter_size reference, a 1.2 relic
......
2000-03-17 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c: Remove the #ifndef
USE_DISPATCHMESSAGE sections, we do want to use DispatchMessage.
* gdk/win32/gdkfont-win32.c
* gdk/win32/gdkproperty-win32.c
* gdk/win32/gdkselection-win32.c
* gdk/win32/gdkwindow-win32.c: Add const to some arguments that are
now declared such.
Wed Mar 15 02:59:38 PST 2000 Manish Singh <yosh@gimp.org>
* gtk/gtkvpaned.c: removed stray gutter_size reference, a 1.2 relic
......
2000-03-17 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c: Remove the #ifndef
USE_DISPATCHMESSAGE sections, we do want to use DispatchMessage.
* gdk/win32/gdkfont-win32.c
* gdk/win32/gdkproperty-win32.c
* gdk/win32/gdkselection-win32.c
* gdk/win32/gdkwindow-win32.c: Add const to some arguments that are
now declared such.
Wed Mar 15 02:59:38 PST 2000 Manish Singh <yosh@gimp.org>
* gtk/gtkvpaned.c: removed stray gutter_size reference, a 1.2 relic
......
2000-03-17 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c: Remove the #ifndef
USE_DISPATCHMESSAGE sections, we do want to use DispatchMessage.
* gdk/win32/gdkfont-win32.c
* gdk/win32/gdkproperty-win32.c
* gdk/win32/gdkselection-win32.c
* gdk/win32/gdkwindow-win32.c: Add const to some arguments that are
now declared such.
Wed Mar 15 02:59:38 PST 2000 Manish Singh <yosh@gimp.org>
* gtk/gtkvpaned.c: removed stray gutter_size reference, a 1.2 relic
......
2000-03-17 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c: Remove the #ifndef
USE_DISPATCHMESSAGE sections, we do want to use DispatchMessage.
* gdk/win32/gdkfont-win32.c
* gdk/win32/gdkproperty-win32.c
* gdk/win32/gdkselection-win32.c
* gdk/win32/gdkwindow-win32.c: Add const to some arguments that are
now declared such.
Wed Mar 15 02:59:38 PST 2000 Manish Singh <yosh@gimp.org>
* gtk/gtkvpaned.c: removed stray gutter_size reference, a 1.2 relic
......
2000-03-17 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c: Remove the #ifndef
USE_DISPATCHMESSAGE sections, we do want to use DispatchMessage.
* gdk/win32/gdkfont-win32.c
* gdk/win32/gdkproperty-win32.c
* gdk/win32/gdkselection-win32.c
* gdk/win32/gdkwindow-win32.c: Add const to some arguments that are
now declared such.
Wed Mar 15 02:59:38 PST 2000 Manish Singh <yosh@gimp.org>
* gtk/gtkvpaned.c: removed stray gutter_size reference, a 1.2 relic
......
......@@ -27,8 +27,6 @@
#include "config.h"
#define USE_DISPATCHMESSAGE
/* Cannot use TrackMouseEvent, as the stupid WM_MOUSELEAVE message
* doesn't tell us where the mouse has gone. Thus we cannot use it to
* generate a correct GdkNotifyType. Pity, as using TrackMouseEvent
......@@ -2943,24 +2941,6 @@ gdk_event_translate (GdkEvent *event,
if (ret_val_flagp)
*ret_val_flagp = FALSE;
#ifndef USE_DISPATCHMESSAGE
if (xevent->message == gdk_ping_msg)
{
/* Messages we post ourselves just to wakeup WaitMessage. */
GDK_NOTE (EVENTS, g_print ("gdk_ping_msg\n"));
return FALSE;
}
else if (xevent->message == g_pipe_readable_msg)
{
GDK_NOTE (EVENTS, g_print ("g_pipe_readable_msg: %d %d\n",
xevent->wParam, xevent->lParam));
g_io_channel_win32_pipe_readable (xevent->wParam, xevent->lParam);
return FALSE;
}
#endif
window = gdk_window_lookup (xevent->hwnd);
orig_window = window;
......@@ -4258,7 +4238,7 @@ gdk_events_queue (void)
MSG msg;
LRESULT lres;
while (!gdk_event_queue_find_first()
while (!gdk_event_queue_find_first ()
&& PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
{
GDK_NOTE (EVENTS, g_print ("PeekMessage: %#x %#x\n",
......@@ -4268,7 +4248,6 @@ gdk_events_queue (void)
|| (paimmmpo->lpVtbl->OnTranslateMessage) (paimmmpo, &msg) != S_OK)
TranslateMessage (&msg);
#ifdef USE_DISPATCHMESSAGE
if (msg.message == g_pipe_readable_msg)
{
GDK_NOTE (EVENTS, g_print ("g_pipe_readable_msg: %d %d\n",
......@@ -4280,33 +4259,6 @@ gdk_events_queue (void)
}
DispatchMessage (&msg);
#else
event = gdk_event_new ();
event->any.type = GDK_NOTHING;
event->any.window = NULL;
event->any.send_event = FALSE;
((GdkEventPrivate *)event)->flags |= GDK_EVENT_PENDING;
gdk_event_queue_append (event);
node = gdk_queued_tail;
if (gdk_event_translate (event, &msg, NULL, NULL))
((GdkEventPrivate *)event)->flags &= ~GDK_EVENT_PENDING;
else
{
if (paimmapp == NULL
|| (paimmapp->lpVtbl->OnDefWindowProc) (paimmapp, msg.hwnd,
msg.message,
msg.wParam, msg.lParam,
&lres) == S_FALSE)
DefWindowProc (msg.hwnd, msg.message, msg.wParam, msg.lParam);
gdk_event_queue_remove_link (node);
g_list_free_1 (node);
gdk_event_free (event);
}
#endif
}
}
......
......@@ -1506,7 +1506,7 @@ gdk_font_load (const gchar *font_name)
}
GdkFont*
gdk_fontset_load (gchar *fontset_name)
gdk_fontset_load (const gchar *fontset_name)
{
GdkFont *font;
GdkFontPrivateWin32 *private;
......
......@@ -131,13 +131,13 @@ gdk_property_get (GdkWindow *window,
}
void
gdk_property_change (GdkWindow *window,
GdkAtom property,
GdkAtom type,
gint format,
GdkPropMode mode,
guchar *data,
gint nelements)
gdk_property_change (GdkWindow *window,
GdkAtom property,
GdkAtom type,
gint format,
GdkPropMode mode,
const guchar *data,
gint nelements)
{
HGLOBAL hdata;
gint i, length;
......@@ -170,9 +170,8 @@ gdk_property_change (GdkWindow *window,
&& mode == GDK_PROP_MODE_REPLACE)
{
length = nelements;
ptr = data;
for (i = 0; i < nelements; i++)
if (*ptr++ == '\n')
if (data[i] == '\n')
length++;
#if 1
GDK_NOTE (MISC, g_print ("...OpenClipboard(%#x)\n",
......
......@@ -366,11 +366,11 @@ gdk_selection_send_notify (guint32 requestor,
}
gint
gdk_text_property_to_text_list (GdkAtom encoding,
gint format,
guchar *text,
gint length,
gchar ***list)
gdk_text_property_to_text_list (GdkAtom encoding,
gint format,
const guchar *text,
gint length,
gchar ***list)
{
GDK_NOTE (MISC,
g_print ("gdk_text_property_to_text_list not implemented\n"));
......@@ -387,11 +387,11 @@ gdk_free_text_list (gchar **list)
}
gint
gdk_string_to_compound_text (gchar *str,
GdkAtom *encoding,
gint *format,
guchar **ctext,
gint *length)
gdk_string_to_compound_text (const gchar *str,
GdkAtom *encoding,
gint *format,
guchar **ctext,
gint *length)
{
g_warning ("gdk_string_to_compound_text: Not implemented");
......
......@@ -1840,8 +1840,8 @@ gdk_window_set_icon (GdkWindow *window,
}
void
gdk_window_set_icon_name (GdkWindow *window,
gchar *name)
gdk_window_set_icon_name (GdkWindow *window,
const gchar *name)
{
g_return_if_fail (window != NULL);
g_return_if_fail (GDK_IS_WINDOW (window));
......
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