diff --git a/ChangeLog b/ChangeLog index 7282c71139..603c407024 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2002-01-09 Tor Lillqvist + + * gdk/win32/gdkprivate-win32.h + * gdk/win32/gdkglobals-win32.c + * gdk/win32/gdkmain-win32.c + * gdk/win32/gdkevents-win32.c: Remove declaration, definition, + initialisation and handling of gdk_selection_notify_msg, + gdk_selection_request_msg and gdk_selection_clear_msg. They aren't + generated any longer. + 2002-01-09 Tor Lillqvist * gdk/win32/gdkevents-win32.c (event_mask_string, print_event, @@ -6,8 +16,9 @@ * gdk/win32/gdkselection-win32.c (gdk_text_property_to_text_list, gdk_free_text_list, gdk_string_to_compound_text, - gdk_free_compound_text): Implement trivially, always as - single-element text list or single-component compound text. + gdk_free_compound_text): Implement trivially, witrh a text_list + always having a single element, and a compound text always + consisting of just a single (UTF-8!) string. 2002-01-09 Tor Lillqvist diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 7282c71139..603c407024 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,13 @@ +2002-01-09 Tor Lillqvist + + * gdk/win32/gdkprivate-win32.h + * gdk/win32/gdkglobals-win32.c + * gdk/win32/gdkmain-win32.c + * gdk/win32/gdkevents-win32.c: Remove declaration, definition, + initialisation and handling of gdk_selection_notify_msg, + gdk_selection_request_msg and gdk_selection_clear_msg. They aren't + generated any longer. + 2002-01-09 Tor Lillqvist * gdk/win32/gdkevents-win32.c (event_mask_string, print_event, @@ -6,8 +16,9 @@ * gdk/win32/gdkselection-win32.c (gdk_text_property_to_text_list, gdk_free_text_list, gdk_string_to_compound_text, - gdk_free_compound_text): Implement trivially, always as - single-element text list or single-component compound text. + gdk_free_compound_text): Implement trivially, witrh a text_list + always having a single element, and a compound text always + consisting of just a single (UTF-8!) string. 2002-01-09 Tor Lillqvist diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7282c71139..603c407024 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +2002-01-09 Tor Lillqvist + + * gdk/win32/gdkprivate-win32.h + * gdk/win32/gdkglobals-win32.c + * gdk/win32/gdkmain-win32.c + * gdk/win32/gdkevents-win32.c: Remove declaration, definition, + initialisation and handling of gdk_selection_notify_msg, + gdk_selection_request_msg and gdk_selection_clear_msg. They aren't + generated any longer. + 2002-01-09 Tor Lillqvist * gdk/win32/gdkevents-win32.c (event_mask_string, print_event, @@ -6,8 +16,9 @@ * gdk/win32/gdkselection-win32.c (gdk_text_property_to_text_list, gdk_free_text_list, gdk_string_to_compound_text, - gdk_free_compound_text): Implement trivially, always as - single-element text list or single-component compound text. + gdk_free_compound_text): Implement trivially, witrh a text_list + always having a single element, and a compound text always + consisting of just a single (UTF-8!) string. 2002-01-09 Tor Lillqvist diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 7282c71139..603c407024 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,13 @@ +2002-01-09 Tor Lillqvist + + * gdk/win32/gdkprivate-win32.h + * gdk/win32/gdkglobals-win32.c + * gdk/win32/gdkmain-win32.c + * gdk/win32/gdkevents-win32.c: Remove declaration, definition, + initialisation and handling of gdk_selection_notify_msg, + gdk_selection_request_msg and gdk_selection_clear_msg. They aren't + generated any longer. + 2002-01-09 Tor Lillqvist * gdk/win32/gdkevents-win32.c (event_mask_string, print_event, @@ -6,8 +16,9 @@ * gdk/win32/gdkselection-win32.c (gdk_text_property_to_text_list, gdk_free_text_list, gdk_string_to_compound_text, - gdk_free_compound_text): Implement trivially, always as - single-element text list or single-component compound text. + gdk_free_compound_text): Implement trivially, witrh a text_list + always having a single element, and a compound text always + consisting of just a single (UTF-8!) string. 2002-01-09 Tor Lillqvist diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7282c71139..603c407024 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +2002-01-09 Tor Lillqvist + + * gdk/win32/gdkprivate-win32.h + * gdk/win32/gdkglobals-win32.c + * gdk/win32/gdkmain-win32.c + * gdk/win32/gdkevents-win32.c: Remove declaration, definition, + initialisation and handling of gdk_selection_notify_msg, + gdk_selection_request_msg and gdk_selection_clear_msg. They aren't + generated any longer. + 2002-01-09 Tor Lillqvist * gdk/win32/gdkevents-win32.c (event_mask_string, print_event, @@ -6,8 +16,9 @@ * gdk/win32/gdkselection-win32.c (gdk_text_property_to_text_list, gdk_free_text_list, gdk_string_to_compound_text, - gdk_free_compound_text): Implement trivially, always as - single-element text list or single-component compound text. + gdk_free_compound_text): Implement trivially, witrh a text_list + always having a single element, and a compound text always + consisting of just a single (UTF-8!) string. 2002-01-09 Tor Lillqvist diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7282c71139..603c407024 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +2002-01-09 Tor Lillqvist + + * gdk/win32/gdkprivate-win32.h + * gdk/win32/gdkglobals-win32.c + * gdk/win32/gdkmain-win32.c + * gdk/win32/gdkevents-win32.c: Remove declaration, definition, + initialisation and handling of gdk_selection_notify_msg, + gdk_selection_request_msg and gdk_selection_clear_msg. They aren't + generated any longer. + 2002-01-09 Tor Lillqvist * gdk/win32/gdkevents-win32.c (event_mask_string, print_event, @@ -6,8 +16,9 @@ * gdk/win32/gdkselection-win32.c (gdk_text_property_to_text_list, gdk_free_text_list, gdk_string_to_compound_text, - gdk_free_compound_text): Implement trivially, always as - single-element text list or single-component compound text. + gdk_free_compound_text): Implement trivially, witrh a text_list + always having a single element, and a compound text always + consisting of just a single (UTF-8!) string. 2002-01-09 Tor Lillqvist diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7282c71139..603c407024 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +2002-01-09 Tor Lillqvist + + * gdk/win32/gdkprivate-win32.h + * gdk/win32/gdkglobals-win32.c + * gdk/win32/gdkmain-win32.c + * gdk/win32/gdkevents-win32.c: Remove declaration, definition, + initialisation and handling of gdk_selection_notify_msg, + gdk_selection_request_msg and gdk_selection_clear_msg. They aren't + generated any longer. + 2002-01-09 Tor Lillqvist * gdk/win32/gdkevents-win32.c (event_mask_string, print_event, @@ -6,8 +16,9 @@ * gdk/win32/gdkselection-win32.c (gdk_text_property_to_text_list, gdk_free_text_list, gdk_string_to_compound_text, - gdk_free_compound_text): Implement trivially, always as - single-element text list or single-component compound text. + gdk_free_compound_text): Implement trivially, witrh a text_list + always having a single element, and a compound text always + consisting of just a single (UTF-8!) string. 2002-01-09 Tor Lillqvist diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 41b39dc7e7..99eb8bd460 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -3329,59 +3329,7 @@ gdk_event_translate (GdkEvent *event, } } - if (xevent->message == gdk_selection_notify_msg) - { - g_print ("gdk_selection_notify_msg: %#x\n", - (guint) xevent->hwnd); - - g_assert_not_reached (); /* Isn't sent any longer */ - - event->selection.type = GDK_SELECTION_NOTIFY; - event->selection.window = window; - event->selection.selection = xevent->wParam; - event->selection.target = xevent->lParam; - event->selection.property = gdk_selection_property; - event->selection.time = xevent->time; - - return_val = !GDK_DRAWABLE_DESTROYED (window); - - goto bypass_switch; - } - else if (xevent->message == gdk_selection_request_msg) - { - g_print ("gdk_selection_request_msg: %#x\n", - (guint) xevent->hwnd); - - g_assert_not_reached (); - - event->selection.type = GDK_SELECTION_REQUEST; - event->selection.window = window; - event->selection.selection = gdk_clipboard_atom; - event->selection.target = GDK_TARGET_STRING; - event->selection.property = gdk_selection_property; - event->selection.requestor = (guint32) xevent->hwnd; - event->selection.time = xevent->time; - - return_val = !GDK_DRAWABLE_DESTROYED (window); - - goto bypass_switch; - } - else if (xevent->message == gdk_selection_clear_msg) - { - g_print ("gdk_selection_clear_msg: %#x\n", - (guint) xevent->hwnd); - - g_assert_not_reached (); - event->selection.type = GDK_SELECTION_CLEAR; - event->selection.window = window; - event->selection.selection = xevent->wParam; - event->selection.time = xevent->time; - - return_val = !GDK_DRAWABLE_DESTROYED (window); - - goto bypass_switch; - } - else if (xevent->message == msh_mousewheel_msg) + if (xevent->message == msh_mousewheel_msg) { GDK_NOTE (EVENTS, g_print ("MSH_MOUSEWHEEL: %#x %d\n", (guint) xevent->hwnd, xevent->wParam)); diff --git a/gdk/win32/gdkglobals-win32.c b/gdk/win32/gdkglobals-win32.c index ee1148f8d4..cee8238153 100644 --- a/gdk/win32/gdkglobals-win32.c +++ b/gdk/win32/gdkglobals-win32.c @@ -32,9 +32,6 @@ gint gdk_event_func_from_window_proc = FALSE; HDC gdk_DC; HINSTANCE gdk_DLLInstance; HINSTANCE gdk_ProgInstance; -UINT gdk_selection_notify_msg; -UINT gdk_selection_request_msg; -UINT gdk_selection_clear_msg; GdkAtom gdk_clipboard_atom; GdkAtom gdk_win32_dropfiles_atom; GdkAtom gdk_ole2_dnd_atom; diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c index da8571347c..9dfa0bd815 100644 --- a/gdk/win32/gdkmain-win32.c +++ b/gdk/win32/gdkmain-win32.c @@ -84,10 +84,6 @@ _gdk_windowing_init_check (int argc, CoInitialize (NULL); - gdk_selection_request_msg = RegisterWindowMessage ("gdk-selection-request"); - gdk_selection_notify_msg = RegisterWindowMessage ("gdk-selection-notify"); - gdk_selection_clear_msg = RegisterWindowMessage ("gdk-selection-clear"); - gdk_selection_property = gdk_atom_intern ("GDK_SELECTION", FALSE); text_uri_list_atom = gdk_atom_intern ("text/uri-list", FALSE); compound_text_atom = gdk_atom_intern ("COMPOUND_TEXT", FALSE); diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h index c836622d0a..cf897a66d5 100644 --- a/gdk/win32/gdkprivate-win32.h +++ b/gdk/win32/gdkprivate-win32.h @@ -482,9 +482,6 @@ extern HDC gdk_DC; extern HINSTANCE gdk_DLLInstance; extern HINSTANCE gdk_ProgInstance; -extern UINT gdk_selection_notify_msg; -extern UINT gdk_selection_request_msg; -extern UINT gdk_selection_clear_msg; GDKVAR GdkAtom gdk_selection_property; extern GdkAtom text_uri_list_atom; extern GdkAtom compound_text_atom;