gdk_device_get_history moved to gdk/gdkinput.c like the other backends
2001-07-20 Hans Breuer <hans@breuer.org> * gdk/win32/gdkinput-win32.c : gdk_device_get_history moved to gdk/gdkinput.c like the other backends * gdk/win32/gdkinput-win32.h : * gdk/win32/gdkinput.c : * gdk/win32/gdkvisual-win32.c : * gdk/win32/gdkwin32.h : mechanical adaption to GdkDevice and GdkVisual GObjectification. UNTESTED for pen-devices because I simply have none. * gdk/gdk.def : * gtk/gtk.def : updated externals * gtk/gtkiconfactory.c : * gtk/gtkoldeditable.c : GError *error needs to be initialized (= NULL) before passing &error to functions to avoid strange crashes * gtk/gtkcontainer.c (gtk_container_real_set_focus_child) : is static * gtk/gtkwidget.c (gtk_widget_get_child_visible): use g_return_val_if_fail * gtk/makefile.msc.in : updated
This commit is contained in:
Hans Breuer
Hans Breuer
parent
9d1e828d08
commit
4c5b559e04
25
ChangeLog
25
ChangeLog
@ -1,3 +1,28 @@
|
||||
2001-07-20 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* gdk/win32/gdkinput-win32.c : gdk_device_get_history moved to
|
||||
gdk/gdkinput.c like the other backends
|
||||
|
||||
* gdk/win32/gdkinput-win32.h :
|
||||
* gdk/win32/gdkinput.c :
|
||||
* gdk/win32/gdkvisual-win32.c :
|
||||
* gdk/win32/gdkwin32.h : mechanical adaption to GdkDevice and
|
||||
GdkVisual GObjectification. UNTESTED for pen-devices because
|
||||
I simply have none.
|
||||
|
||||
* gdk/gdk.def :
|
||||
* gtk/gtk.def : updated externals
|
||||
|
||||
* gtk/gtkiconfactory.c :
|
||||
* gtk/gtkoldeditable.c : GError *error needs to be initialized (= NULL)
|
||||
before passing &error to functions to avoid strange crashes
|
||||
|
||||
* gtk/gtkcontainer.c (gtk_container_real_set_focus_child) : is static
|
||||
|
||||
* gtk/gtkwidget.c (gtk_widget_get_child_visible): use g_return_val_if_fail
|
||||
|
||||
* gtk/makefile.msc.in : updated
|
||||
|
||||
Thu Jul 19 15:35:32 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_set_vadjustment):
|
||||
|
||||
@ -1,3 +1,28 @@
|
||||
2001-07-20 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* gdk/win32/gdkinput-win32.c : gdk_device_get_history moved to
|
||||
gdk/gdkinput.c like the other backends
|
||||
|
||||
* gdk/win32/gdkinput-win32.h :
|
||||
* gdk/win32/gdkinput.c :
|
||||
* gdk/win32/gdkvisual-win32.c :
|
||||
* gdk/win32/gdkwin32.h : mechanical adaption to GdkDevice and
|
||||
GdkVisual GObjectification. UNTESTED for pen-devices because
|
||||
I simply have none.
|
||||
|
||||
* gdk/gdk.def :
|
||||
* gtk/gtk.def : updated externals
|
||||
|
||||
* gtk/gtkiconfactory.c :
|
||||
* gtk/gtkoldeditable.c : GError *error needs to be initialized (= NULL)
|
||||
before passing &error to functions to avoid strange crashes
|
||||
|
||||
* gtk/gtkcontainer.c (gtk_container_real_set_focus_child) : is static
|
||||
|
||||
* gtk/gtkwidget.c (gtk_widget_get_child_visible): use g_return_val_if_fail
|
||||
|
||||
* gtk/makefile.msc.in : updated
|
||||
|
||||
Thu Jul 19 15:35:32 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_set_vadjustment):
|
||||
|
||||
@ -1,3 +1,28 @@
|
||||
2001-07-20 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* gdk/win32/gdkinput-win32.c : gdk_device_get_history moved to
|
||||
gdk/gdkinput.c like the other backends
|
||||
|
||||
* gdk/win32/gdkinput-win32.h :
|
||||
* gdk/win32/gdkinput.c :
|
||||
* gdk/win32/gdkvisual-win32.c :
|
||||
* gdk/win32/gdkwin32.h : mechanical adaption to GdkDevice and
|
||||
GdkVisual GObjectification. UNTESTED for pen-devices because
|
||||
I simply have none.
|
||||
|
||||
* gdk/gdk.def :
|
||||
* gtk/gtk.def : updated externals
|
||||
|
||||
* gtk/gtkiconfactory.c :
|
||||
* gtk/gtkoldeditable.c : GError *error needs to be initialized (= NULL)
|
||||
before passing &error to functions to avoid strange crashes
|
||||
|
||||
* gtk/gtkcontainer.c (gtk_container_real_set_focus_child) : is static
|
||||
|
||||
* gtk/gtkwidget.c (gtk_widget_get_child_visible): use g_return_val_if_fail
|
||||
|
||||
* gtk/makefile.msc.in : updated
|
||||
|
||||
Thu Jul 19 15:35:32 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_set_vadjustment):
|
||||
|
||||
@ -1,3 +1,28 @@
|
||||
2001-07-20 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* gdk/win32/gdkinput-win32.c : gdk_device_get_history moved to
|
||||
gdk/gdkinput.c like the other backends
|
||||
|
||||
* gdk/win32/gdkinput-win32.h :
|
||||
* gdk/win32/gdkinput.c :
|
||||
* gdk/win32/gdkvisual-win32.c :
|
||||
* gdk/win32/gdkwin32.h : mechanical adaption to GdkDevice and
|
||||
GdkVisual GObjectification. UNTESTED for pen-devices because
|
||||
I simply have none.
|
||||
|
||||
* gdk/gdk.def :
|
||||
* gtk/gtk.def : updated externals
|
||||
|
||||
* gtk/gtkiconfactory.c :
|
||||
* gtk/gtkoldeditable.c : GError *error needs to be initialized (= NULL)
|
||||
before passing &error to functions to avoid strange crashes
|
||||
|
||||
* gtk/gtkcontainer.c (gtk_container_real_set_focus_child) : is static
|
||||
|
||||
* gtk/gtkwidget.c (gtk_widget_get_child_visible): use g_return_val_if_fail
|
||||
|
||||
* gtk/makefile.msc.in : updated
|
||||
|
||||
Thu Jul 19 15:35:32 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_set_vadjustment):
|
||||
|
||||
@ -1,3 +1,28 @@
|
||||
2001-07-20 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* gdk/win32/gdkinput-win32.c : gdk_device_get_history moved to
|
||||
gdk/gdkinput.c like the other backends
|
||||
|
||||
* gdk/win32/gdkinput-win32.h :
|
||||
* gdk/win32/gdkinput.c :
|
||||
* gdk/win32/gdkvisual-win32.c :
|
||||
* gdk/win32/gdkwin32.h : mechanical adaption to GdkDevice and
|
||||
GdkVisual GObjectification. UNTESTED for pen-devices because
|
||||
I simply have none.
|
||||
|
||||
* gdk/gdk.def :
|
||||
* gtk/gtk.def : updated externals
|
||||
|
||||
* gtk/gtkiconfactory.c :
|
||||
* gtk/gtkoldeditable.c : GError *error needs to be initialized (= NULL)
|
||||
before passing &error to functions to avoid strange crashes
|
||||
|
||||
* gtk/gtkcontainer.c (gtk_container_real_set_focus_child) : is static
|
||||
|
||||
* gtk/gtkwidget.c (gtk_widget_get_child_visible): use g_return_val_if_fail
|
||||
|
||||
* gtk/makefile.msc.in : updated
|
||||
|
||||
Thu Jul 19 15:35:32 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_set_vadjustment):
|
||||
|
||||
@ -1,3 +1,28 @@
|
||||
2001-07-20 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* gdk/win32/gdkinput-win32.c : gdk_device_get_history moved to
|
||||
gdk/gdkinput.c like the other backends
|
||||
|
||||
* gdk/win32/gdkinput-win32.h :
|
||||
* gdk/win32/gdkinput.c :
|
||||
* gdk/win32/gdkvisual-win32.c :
|
||||
* gdk/win32/gdkwin32.h : mechanical adaption to GdkDevice and
|
||||
GdkVisual GObjectification. UNTESTED for pen-devices because
|
||||
I simply have none.
|
||||
|
||||
* gdk/gdk.def :
|
||||
* gtk/gtk.def : updated externals
|
||||
|
||||
* gtk/gtkiconfactory.c :
|
||||
* gtk/gtkoldeditable.c : GError *error needs to be initialized (= NULL)
|
||||
before passing &error to functions to avoid strange crashes
|
||||
|
||||
* gtk/gtkcontainer.c (gtk_container_real_set_focus_child) : is static
|
||||
|
||||
* gtk/gtkwidget.c (gtk_widget_get_child_visible): use g_return_val_if_fail
|
||||
|
||||
* gtk/makefile.msc.in : updated
|
||||
|
||||
Thu Jul 19 15:35:32 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_set_vadjustment):
|
||||
|
||||
@ -1,3 +1,28 @@
|
||||
2001-07-20 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* gdk/win32/gdkinput-win32.c : gdk_device_get_history moved to
|
||||
gdk/gdkinput.c like the other backends
|
||||
|
||||
* gdk/win32/gdkinput-win32.h :
|
||||
* gdk/win32/gdkinput.c :
|
||||
* gdk/win32/gdkvisual-win32.c :
|
||||
* gdk/win32/gdkwin32.h : mechanical adaption to GdkDevice and
|
||||
GdkVisual GObjectification. UNTESTED for pen-devices because
|
||||
I simply have none.
|
||||
|
||||
* gdk/gdk.def :
|
||||
* gtk/gtk.def : updated externals
|
||||
|
||||
* gtk/gtkiconfactory.c :
|
||||
* gtk/gtkoldeditable.c : GError *error needs to be initialized (= NULL)
|
||||
before passing &error to functions to avoid strange crashes
|
||||
|
||||
* gtk/gtkcontainer.c (gtk_container_real_set_focus_child) : is static
|
||||
|
||||
* gtk/gtkwidget.c (gtk_widget_get_child_visible): use g_return_val_if_fail
|
||||
|
||||
* gtk/makefile.msc.in : updated
|
||||
|
||||
Thu Jul 19 15:35:32 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_set_vadjustment):
|
||||
|
||||
86
gdk/gdk.def
86
gdk/gdk.def
@ -3,6 +3,7 @@ EXPORTS
|
||||
gdk_atom_name
|
||||
gdk_beep
|
||||
gdk_bitmap_create_from_data
|
||||
gdk_cap_style_get_type
|
||||
gdk_char_height
|
||||
gdk_char_measure
|
||||
gdk_char_width
|
||||
@ -13,6 +14,7 @@ EXPORTS
|
||||
gdk_color_copy
|
||||
gdk_color_equal
|
||||
gdk_color_free
|
||||
gdk_color_get_type
|
||||
gdk_color_hash
|
||||
gdk_color_parse
|
||||
gdk_color_white
|
||||
@ -24,8 +26,8 @@ EXPORTS
|
||||
gdk_colormap_get_system_size
|
||||
gdk_colormap_get_type
|
||||
gdk_colormap_get_visual
|
||||
gdk_colormap_query_color
|
||||
gdk_colormap_new
|
||||
gdk_colormap_query_color
|
||||
gdk_colormap_ref
|
||||
gdk_colormap_unref
|
||||
gdk_colors_alloc
|
||||
@ -35,6 +37,7 @@ EXPORTS
|
||||
gdk_cursor_new
|
||||
gdk_cursor_new_from_pixmap
|
||||
gdk_cursor_ref
|
||||
gdk_cursor_type_get_type
|
||||
gdk_cursor_unref
|
||||
gdk_device_free_history
|
||||
gdk_device_get_axis
|
||||
@ -47,6 +50,7 @@ EXPORTS
|
||||
gdk_devices_list
|
||||
gdk_dnd_init
|
||||
gdk_drag_abort
|
||||
gdk_drag_action_get_type
|
||||
gdk_drag_begin
|
||||
gdk_drag_context_get_type
|
||||
gdk_drag_context_new
|
||||
@ -57,6 +61,7 @@ EXPORTS
|
||||
gdk_drag_get_protocol
|
||||
gdk_drag_get_selection
|
||||
gdk_drag_motion
|
||||
gdk_drag_protocol_get_type
|
||||
gdk_drag_status
|
||||
gdk_draw_arc
|
||||
gdk_draw_drawable
|
||||
@ -82,6 +87,7 @@ EXPORTS
|
||||
gdk_draw_text
|
||||
gdk_draw_text_wc
|
||||
gdk_drawable_get_colormap
|
||||
gdk_drawable_get_depth
|
||||
gdk_drawable_get_image
|
||||
gdk_drawable_get_size
|
||||
gdk_drawable_get_type
|
||||
@ -107,7 +113,9 @@ EXPORTS
|
||||
gdk_event_get_graphics_expose
|
||||
gdk_event_get_state
|
||||
gdk_event_get_time
|
||||
gdk_event_get_type
|
||||
gdk_event_handler_set
|
||||
gdk_event_mask_get_type
|
||||
gdk_event_new
|
||||
gdk_event_peek
|
||||
gdk_event_put
|
||||
@ -119,11 +127,14 @@ EXPORTS
|
||||
gdk_event_unqueue
|
||||
gdk_events_pending
|
||||
gdk_exit
|
||||
gdk_extension_mode_get_type
|
||||
gdk_fill_get_type
|
||||
gdk_flush
|
||||
gdk_font_equal
|
||||
gdk_font_from_description
|
||||
gdk_font_full_name_free
|
||||
gdk_font_full_name_get
|
||||
gdk_font_get_type
|
||||
gdk_font_id
|
||||
gdk_font_load
|
||||
gdk_font_ref
|
||||
@ -131,7 +142,10 @@ EXPORTS
|
||||
gdk_fontset_load
|
||||
gdk_free_compound_text
|
||||
gdk_free_text_list
|
||||
gdk_function_get_type
|
||||
gdk_gc_copy
|
||||
gdk_gc_get_colormap
|
||||
gdk_gc_get_type
|
||||
gdk_gc_get_values
|
||||
gdk_gc_new
|
||||
gdk_gc_new_with_values
|
||||
@ -159,6 +173,7 @@ EXPORTS
|
||||
gdk_get_display
|
||||
gdk_get_show_events
|
||||
gdk_get_use_xshm
|
||||
gdk_gravity_get_type
|
||||
gdk_image_get
|
||||
gdk_image_get_pixel
|
||||
gdk_image_get_type
|
||||
@ -166,16 +181,19 @@ EXPORTS
|
||||
gdk_image_new_bitmap
|
||||
gdk_image_put_pixel
|
||||
gdk_image_ref
|
||||
gdk_image_type_get_type
|
||||
gdk_image_unref
|
||||
gdk_init
|
||||
gdk_init_check
|
||||
gdk_input_add
|
||||
gdk_input_add_full
|
||||
gdk_input_condition_get_type
|
||||
gdk_input_exit
|
||||
gdk_input_init
|
||||
gdk_input_motion_events
|
||||
gdk_input_remove
|
||||
gdk_input_set_extension_events
|
||||
gdk_join_style_get_type
|
||||
gdk_key_repeat_disable
|
||||
gdk_key_repeat_restore
|
||||
gdk_keyboard_grab
|
||||
@ -195,8 +213,10 @@ EXPORTS
|
||||
gdk_keyval_to_lower
|
||||
gdk_keyval_to_unicode
|
||||
gdk_keyval_to_upper
|
||||
gdk_line_style_get_type
|
||||
gdk_list_visuals
|
||||
gdk_mbstowcs
|
||||
gdk_modifier_type_get_type
|
||||
gdk_null_window_warnings
|
||||
gdk_pango_attr_embossed_new
|
||||
gdk_pango_attr_stipple_new
|
||||
@ -221,6 +241,7 @@ EXPORTS
|
||||
gdk_pointer_is_grabbed
|
||||
gdk_pointer_ungrab
|
||||
gdk_progclass
|
||||
gdk_prop_mode_get_type
|
||||
gdk_property_change
|
||||
gdk_property_delete
|
||||
gdk_property_get
|
||||
@ -248,6 +269,7 @@ EXPORTS
|
||||
gdk_rgb_cmap_free
|
||||
gdk_rgb_cmap_new
|
||||
gdk_rgb_colormap_ditherable
|
||||
gdk_rgb_dither_get_type
|
||||
gdk_rgb_ditherable
|
||||
gdk_rgb_gc_set_background
|
||||
gdk_rgb_gc_set_foreground
|
||||
@ -268,15 +290,19 @@ EXPORTS
|
||||
gdk_selection_property
|
||||
gdk_selection_property_get
|
||||
gdk_selection_send_notify
|
||||
gdk_set_double_click_time
|
||||
gdk_set_locale
|
||||
gdk_set_show_events
|
||||
gdk_set_sm_client_id
|
||||
gdk_set_use_xshm
|
||||
gdk_setting_get
|
||||
gdk_string_extents
|
||||
gdk_string_height
|
||||
gdk_string_measure
|
||||
gdk_string_to_compound_text
|
||||
gdk_string_width
|
||||
gdk_subwindow_mode_get_type
|
||||
gdk_synthesize_window_state
|
||||
gdk_text_extents
|
||||
gdk_text_extents_wc
|
||||
gdk_text_height
|
||||
@ -298,8 +324,8 @@ EXPORTS
|
||||
gdk_visual_get_best_with_depth
|
||||
gdk_visual_get_best_with_type
|
||||
gdk_visual_get_system
|
||||
gdk_visual_ref
|
||||
gdk_visual_unref
|
||||
gdk_visual_get_type
|
||||
gdk_visual_type_get_type
|
||||
gdk_wcstombs
|
||||
gdk_win32_handle_table_lookup
|
||||
gdk_win32_hdc_get
|
||||
@ -314,10 +340,13 @@ EXPORTS
|
||||
gdk_window_clear_area
|
||||
gdk_window_clear_area_e
|
||||
gdk_window_constrain_size
|
||||
gdk_window_deiconify
|
||||
gdk_window_destroy
|
||||
gdk_window_destroy_notify
|
||||
gdk_window_end_paint
|
||||
gdk_window_focus
|
||||
gdk_window_foreign_new
|
||||
gdk_window_freeze_updates
|
||||
gdk_window_get_children
|
||||
gdk_window_get_deskrelative_origin
|
||||
gdk_window_get_events
|
||||
@ -331,12 +360,15 @@ EXPORTS
|
||||
gdk_window_get_toplevel
|
||||
gdk_window_get_toplevels
|
||||
gdk_window_get_user_data
|
||||
gdk_window_get_window_type
|
||||
gdk_window_hide
|
||||
gdk_window_iconify
|
||||
gdk_window_invalidate_rect
|
||||
gdk_window_invalidate_region
|
||||
gdk_window_is_viewable
|
||||
gdk_window_is_visible
|
||||
gdk_window_lower
|
||||
gdk_window_maximize
|
||||
gdk_window_merge_child_shapes
|
||||
gdk_window_move
|
||||
gdk_window_move_resize
|
||||
@ -364,55 +396,23 @@ EXPORTS
|
||||
gdk_window_set_hints
|
||||
gdk_window_set_icon
|
||||
gdk_window_set_icon_name
|
||||
gdk_window_set_modal_hint
|
||||
gdk_window_set_override_redirect
|
||||
gdk_window_set_role
|
||||
gdk_window_set_static_gravities
|
||||
gdk_window_set_title
|
||||
gdk_window_set_transient_for
|
||||
gdk_window_set_type_hint
|
||||
gdk_window_set_user_data
|
||||
gdk_window_shape_combine_mask
|
||||
gdk_window_shape_combine_region
|
||||
gdk_window_show
|
||||
gdk_window_withdraw
|
||||
gdk_window_deiconify
|
||||
gdk_window_focus
|
||||
gdk_window_iconify
|
||||
gdk_window_maximize
|
||||
gdk_window_set_modal_hint
|
||||
gdk_window_set_type_hint
|
||||
gdk_window_stick
|
||||
gdk_window_thaw_updates
|
||||
gdk_window_type_hint_get_type
|
||||
gdk_window_unmaximize
|
||||
gdk_window_unstick
|
||||
gdk_color_get_type
|
||||
gdk_event_get_type
|
||||
gdk_event_mask_get_type
|
||||
gdk_extension_mode_get_type
|
||||
gdk_input_condition_get_type
|
||||
gdk_modifier_type_get_type
|
||||
gdk_set_double_click_time
|
||||
gdk_setting_get
|
||||
gdk_cap_style_get_type
|
||||
gdk_cursor_type_get_type
|
||||
gdk_drag_action_get_type
|
||||
gdk_drag_protocol_get_type
|
||||
gdk_drawable_get_depth
|
||||
gdk_fill_get_type
|
||||
gdk_font_get_type
|
||||
gdk_function_get_type
|
||||
gdk_gc_get_colormap
|
||||
gdk_gc_get_type
|
||||
gdk_gravity_get_type
|
||||
gdk_image_type_get_type
|
||||
gdk_join_style_get_type
|
||||
gdk_line_style_get_type
|
||||
gdk_prop_mode_get_type
|
||||
gdk_rgb_dither_get_type
|
||||
gdk_subwindow_mode_get_type
|
||||
gdk_visual_get_type
|
||||
gdk_visual_type_get_type
|
||||
gdk_window_freeze_updates
|
||||
gdk_window_get_window_type
|
||||
gdk_window_thaw_updates
|
||||
gdk_window_type_hint_get_type
|
||||
gdk_wm_decoration_get_type
|
||||
gdk_wm_function_get_type
|
||||
gdk_window_withdraw
|
||||
gdk_wm_decoration_get_type
|
||||
gdk_wm_function_get_type
|
||||
|
||||
|
||||
@ -77,31 +77,6 @@ static GdkWindow *wintab_window;
|
||||
|
||||
#endif /* HAVE_WINTAB */
|
||||
|
||||
gboolean
|
||||
gdk_device_get_history (GdkDevice *device,
|
||||
GdkWindow *window,
|
||||
guint32 start,
|
||||
guint32 stop,
|
||||
GdkTimeCoord ***events,
|
||||
gint *n_events)
|
||||
{
|
||||
g_return_val_if_fail (window != NULL, FALSE);
|
||||
g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE);
|
||||
g_return_val_if_fail (events != NULL, FALSE);
|
||||
g_return_val_if_fail (n_events != NULL, FALSE);
|
||||
|
||||
*n_events = 0;
|
||||
*events = NULL;
|
||||
|
||||
if (GDK_WINDOW_DESTROYED (window))
|
||||
return FALSE;
|
||||
|
||||
if (GDK_IS_CORE (device))
|
||||
return FALSE;
|
||||
else
|
||||
return _gdk_device_get_history (device, window, start, stop, events, n_events);
|
||||
}
|
||||
|
||||
#ifdef HAVE_WINTAB
|
||||
|
||||
static GdkDevicePrivate *
|
||||
@ -1222,10 +1197,11 @@ gdk_input_init (void)
|
||||
gdk_input_ignore_core = FALSE;
|
||||
gdk_input_devices = NULL;
|
||||
|
||||
_gdk_init_input_core ();
|
||||
#ifdef HAVE_WINTAB
|
||||
gdk_input_wintab_init ();
|
||||
#endif /* HAVE_WINTAB */
|
||||
|
||||
gdk_input_devices = g_list_append (gdk_input_devices, &gdk_input_core_info);
|
||||
gdk_input_devices = g_list_append (gdk_input_devices, gdk_core_pointer);
|
||||
}
|
||||
|
||||
|
||||
@ -52,6 +52,11 @@ struct _GdkAxisInfo
|
||||
gint min_value, max_value;
|
||||
};
|
||||
|
||||
struct _GdkDeviceClass
|
||||
{
|
||||
GObjectClass parent_class;
|
||||
};
|
||||
|
||||
#define GDK_INPUT_NUM_EVENTC 6
|
||||
|
||||
struct _GdkDevicePrivate
|
||||
@ -123,9 +128,8 @@ extern GList *gdk_input_windows;
|
||||
|
||||
extern gint gdk_input_ignore_core;
|
||||
|
||||
extern GdkDevice gdk_input_core_info;
|
||||
|
||||
/* Function declarations */
|
||||
void _gdk_init_input_core (void);
|
||||
|
||||
void gdk_input_window_destroy (GdkWindow *window);
|
||||
GdkTimeCoord ** _gdk_device_allocate_history (GdkDevice *device,
|
||||
|
||||
@ -50,29 +50,70 @@ static GdkDeviceAxis gdk_input_core_axes[] = {
|
||||
{ GDK_AXIS_Y, 0, 0 }
|
||||
};
|
||||
|
||||
GdkDevice gdk_input_core_info =
|
||||
{
|
||||
"Core Pointer",
|
||||
GDK_SOURCE_MOUSE,
|
||||
GDK_MODE_SCREEN,
|
||||
TRUE,
|
||||
|
||||
2,
|
||||
gdk_input_core_axes,
|
||||
|
||||
0,
|
||||
NULL
|
||||
};
|
||||
|
||||
/* Global variables */
|
||||
|
||||
GDKVAR GdkDevice *gdk_core_pointer = (GdkDevice *)&gdk_input_core_info;
|
||||
GDKVAR GdkDevice *gdk_core_pointer = NULL;
|
||||
|
||||
gint gdk_input_ignore_core;
|
||||
|
||||
GList *gdk_input_devices;
|
||||
GList *gdk_input_windows;
|
||||
|
||||
void
|
||||
_gdk_init_input_core (void)
|
||||
{
|
||||
gdk_core_pointer = g_object_new (GDK_TYPE_DEVICE, NULL);
|
||||
|
||||
gdk_core_pointer->name = "Core Pointer";
|
||||
gdk_core_pointer->source = GDK_SOURCE_MOUSE;
|
||||
gdk_core_pointer->mode = GDK_MODE_SCREEN;
|
||||
gdk_core_pointer->has_cursor = TRUE;
|
||||
gdk_core_pointer->num_axes = 2;
|
||||
gdk_core_pointer->axes = gdk_input_core_axes;
|
||||
gdk_core_pointer->num_keys = 0;
|
||||
gdk_core_pointer->keys = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
gdk_device_finalize (GObject *object)
|
||||
{
|
||||
g_error ("A GdkDevice object was finalized. This should not happen");
|
||||
}
|
||||
|
||||
static void
|
||||
gdk_device_class_init (GObjectClass *class)
|
||||
{
|
||||
class->finalize = gdk_device_finalize;
|
||||
}
|
||||
|
||||
GType
|
||||
gdk_device_get_type (void)
|
||||
{
|
||||
static GType object_type = 0;
|
||||
|
||||
if (!object_type)
|
||||
{
|
||||
static const GTypeInfo object_info =
|
||||
{
|
||||
sizeof (GdkDeviceClass),
|
||||
(GBaseInitFunc) NULL,
|
||||
(GBaseFinalizeFunc) NULL,
|
||||
(GClassInitFunc) gdk_device_class_init,
|
||||
NULL, /* class_finalize */
|
||||
NULL, /* class_data */
|
||||
sizeof (GdkDevicePrivate),
|
||||
0, /* n_preallocs */
|
||||
(GInstanceInitFunc) NULL,
|
||||
};
|
||||
|
||||
object_type = g_type_register_static (G_TYPE_OBJECT,
|
||||
"GdkDevice",
|
||||
&object_info, 0);
|
||||
}
|
||||
|
||||
return object_type;
|
||||
}
|
||||
|
||||
GList *
|
||||
gdk_devices_list (void)
|
||||
{
|
||||
@ -130,6 +171,31 @@ gdk_device_set_axis_use (GdkDevice *device,
|
||||
}
|
||||
}
|
||||
|
||||
gboolean
|
||||
gdk_device_get_history (GdkDevice *device,
|
||||
GdkWindow *window,
|
||||
guint32 start,
|
||||
guint32 stop,
|
||||
GdkTimeCoord ***events,
|
||||
gint *n_events)
|
||||
{
|
||||
g_return_val_if_fail (window != NULL, FALSE);
|
||||
g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE);
|
||||
g_return_val_if_fail (events != NULL, FALSE);
|
||||
g_return_val_if_fail (n_events != NULL, FALSE);
|
||||
|
||||
*n_events = 0;
|
||||
*events = NULL;
|
||||
|
||||
if (GDK_WINDOW_DESTROYED (window))
|
||||
return FALSE;
|
||||
|
||||
if (GDK_IS_CORE (device))
|
||||
return FALSE;
|
||||
else
|
||||
return _gdk_device_get_history (device, window, start, stop, events, n_events);
|
||||
}
|
||||
|
||||
GdkTimeCoord **
|
||||
_gdk_device_allocate_history (GdkDevice *device,
|
||||
gint n_events)
|
||||
@ -281,7 +347,10 @@ gdk_input_exit (void)
|
||||
}
|
||||
|
||||
gboolean
|
||||
gdk_device_get_axis (GdkDevice *device, gdouble *axes, GdkAxisUse use, gdouble *value)
|
||||
gdk_device_get_axis (GdkDevice *device,
|
||||
gdouble *axes,
|
||||
GdkAxisUse use,
|
||||
gdouble *value)
|
||||
{
|
||||
gint i;
|
||||
|
||||
|
||||
@ -28,6 +28,7 @@
|
||||
|
||||
#include "gdkvisual.h"
|
||||
#include "gdkprivate-win32.h"
|
||||
//#include "gdkinternals.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
@ -35,12 +36,53 @@ static void gdk_visual_decompose_mask (gulong mask,
|
||||
gint *shift,
|
||||
gint *prec);
|
||||
|
||||
static GdkVisualPrivate *system_visual;
|
||||
static GdkVisualPrivate *system_visual = NULL;
|
||||
|
||||
static gint available_depths[1];
|
||||
|
||||
static GdkVisualType available_types[1];
|
||||
|
||||
static void
|
||||
gdk_visual_finalize (GObject *object)
|
||||
{
|
||||
g_error ("A GdkVisual object was finalized. This should not happen");
|
||||
}
|
||||
|
||||
static void
|
||||
gdk_visual_class_init (GObjectClass *class)
|
||||
{
|
||||
class->finalize = gdk_visual_finalize;
|
||||
}
|
||||
|
||||
|
||||
GType
|
||||
gdk_visual_get_type (void)
|
||||
{
|
||||
static GType object_type = 0;
|
||||
|
||||
if (!object_type)
|
||||
{
|
||||
static const GTypeInfo object_info =
|
||||
{
|
||||
sizeof (GdkVisualClass),
|
||||
(GBaseInitFunc) NULL,
|
||||
(GBaseFinalizeFunc) NULL,
|
||||
(GClassInitFunc) gdk_visual_class_init,
|
||||
NULL, /* class_finalize */
|
||||
NULL, /* class_data */
|
||||
sizeof (GdkVisual),
|
||||
0, /* n_preallocs */
|
||||
(GInstanceInitFunc) NULL,
|
||||
};
|
||||
|
||||
object_type = g_type_register_static (G_TYPE_OBJECT,
|
||||
"GdkVisual",
|
||||
&object_info, 0);
|
||||
}
|
||||
|
||||
return object_type;
|
||||
}
|
||||
|
||||
void
|
||||
gdk_visual_init (void)
|
||||
{
|
||||
@ -210,18 +252,6 @@ gdk_visual_init (void)
|
||||
available_types[0] = system_visual->visual.type;
|
||||
}
|
||||
|
||||
GdkVisual*
|
||||
gdk_visual_ref (GdkVisual *visual)
|
||||
{
|
||||
return visual;
|
||||
}
|
||||
|
||||
void
|
||||
gdk_visual_unref (GdkVisual *visual)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
gint
|
||||
gdk_visual_get_best_depth (void)
|
||||
{
|
||||
|
||||
@ -259,6 +259,11 @@ struct _GdkFontPrivateWin32
|
||||
GSList *names;
|
||||
};
|
||||
|
||||
struct _GdkVisualClass
|
||||
{
|
||||
GObjectClass parent_class;
|
||||
};
|
||||
|
||||
struct _GdkVisualPrivate
|
||||
{
|
||||
GdkVisual visual;
|
||||
|
||||
383
gtk/gtk.def
383
gtk/gtk.def
File diff suppressed because it is too large
Load Diff
@ -1488,7 +1488,7 @@ gtk_container_child_composite_name (GtkContainer *container,
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
gtk_container_real_set_focus_child (GtkContainer *container,
|
||||
GtkWidget *child)
|
||||
{
|
||||
|
||||
@ -1036,7 +1036,7 @@ find_and_prep_icon_source (GtkIconSet *icon_set,
|
||||
|
||||
if (source->pixbuf == NULL)
|
||||
{
|
||||
GError *error;
|
||||
GError *error = NULL;
|
||||
|
||||
g_assert (source->filename);
|
||||
source->pixbuf = gdk_pixbuf_new_from_file (source->filename, &error);
|
||||
|
||||
@ -517,7 +517,7 @@ gtk_old_editable_get_public_chars (GtkOldEditable *old_editable,
|
||||
|
||||
if (old_editable->visible)
|
||||
{
|
||||
GError *error;
|
||||
GError *error = NULL;
|
||||
gchar *tmp = gtk_editable_get_chars (GTK_EDITABLE (old_editable), start, end);
|
||||
|
||||
if (need_conversion)
|
||||
@ -636,7 +636,7 @@ gtk_old_editable_paste_received (GtkOldEditable *old_editable,
|
||||
|
||||
if (text)
|
||||
{
|
||||
GError *error;
|
||||
GError *error = NULL;
|
||||
|
||||
need_conversion = !g_get_charset (&charset);
|
||||
|
||||
|
||||
@ -4229,7 +4229,7 @@ gtk_widget_set_child_visible (GtkWidget *widget,
|
||||
gboolean
|
||||
gtk_widget_get_child_visible (GtkWidget *widget)
|
||||
{
|
||||
g_return_if_fail (GTK_IS_WIDGET (widget));
|
||||
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
|
||||
|
||||
return GTK_WIDGET_CHILD_VISIBLE (widget);
|
||||
}
|
||||
|
||||
@ -13,6 +13,7 @@ TOP = ..\..
|
||||
GTK_VER = @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@
|
||||
GDK_PIXBUF_VER = @GDK_PIXBUF_MAJOR@.@GDK_PIXBUF_MINOR@
|
||||
|
||||
|
||||
GDK_LIBS = ../gdk/gdk-win32-$(GTK_VER).lib
|
||||
GTK_LIBS = gtk-win32-$(GTK_VER).lib
|
||||
GDK_PIXBUF_LIBS = ../gdk-pixbuf/gdk_pixbuf-$(GDK_PIXBUF_VER).lib
|
||||
@ -32,21 +33,20 @@ DEFINES = -DG_ENABLE_DEBUG -DGTK_DISABLE_COMPAT_H -DG_LOG_DOMAIN=\"Gtk\" -Dnear=
|
||||
|
||||
TOUCH = copy makefile.msc+nul
|
||||
|
||||
GTK_VER=1.3
|
||||
|
||||
all : \
|
||||
..\config.h \
|
||||
generated \
|
||||
gtk-win32-$(GTK_VER).dll \
|
||||
gtk-win32-$(GTK_VER)s.lib
|
||||
|
||||
gtk_OBJECTS = \
|
||||
fnmatch.obj \
|
||||
# gdk-pixbuf-loader.obj \
|
||||
gtkaccelgroup.obj \
|
||||
gtkaccellabel.obj \
|
||||
gtkaccessible.obj \
|
||||
gtkadjustment.obj \
|
||||
gtkalignment.obj \
|
||||
gtkarg.obj \
|
||||
gtkarrow.obj \
|
||||
gtkaspectframe.obj \
|
||||
gtkbin.obj \
|
||||
@ -70,7 +70,6 @@ gtk_OBJECTS = \
|
||||
gtkcontainer.obj \
|
||||
gtkctree.obj \
|
||||
gtkcurve.obj \
|
||||
gtkdata.obj \
|
||||
gtkdialog.obj \
|
||||
gtkdnd.obj \
|
||||
gtkdrawingarea.obj \
|
||||
@ -119,7 +118,7 @@ gtk_OBJECTS = \
|
||||
gtkobject.obj \
|
||||
gtkoldeditable.obj \
|
||||
gtkoptionmenu.obj \
|
||||
gtkpacker.obj \
|
||||
# gtkpacker.obj \
|
||||
gtkpaned.obj \
|
||||
gtkpixmap.obj \
|
||||
gtkplug.obj \
|
||||
@ -140,6 +139,7 @@ gtk_OBJECTS = \
|
||||
gtkseparatormenuitem.obj \
|
||||
gtksettings.obj \
|
||||
gtksignal.obj \
|
||||
gtksizegroup.obj \
|
||||
gtksocket.obj \
|
||||
gtkspinbutton.obj \
|
||||
gtkstyle.obj \
|
||||
@ -195,9 +195,9 @@ gtk_public_h_sources = \
|
||||
gtk.h \
|
||||
gtkaccelgroup.h \
|
||||
gtkaccellabel.h \
|
||||
gtkaccessible.h \
|
||||
gtkadjustment.h \
|
||||
gtkalignment.h \
|
||||
gtkarg.h \
|
||||
gtkarrow.h \
|
||||
gtkaspectframe.h \
|
||||
gtkbin.h \
|
||||
@ -213,7 +213,6 @@ gtk_public_h_sources = \
|
||||
gtkcolorsel.h \
|
||||
gtkcolorseldialog.h \
|
||||
gtkcombo.h \
|
||||
gtkcompat.h \
|
||||
gtkcontainer.h \
|
||||
gtkctree.h \
|
||||
gtkcurve.h \
|
||||
@ -222,7 +221,6 @@ gtk_public_h_sources = \
|
||||
gtkcellrenderertextpixbuf.h \
|
||||
gtkcellrenderertoggle.h \
|
||||
gtkcellrendererpixbuf.h \
|
||||
gtkdata.h \
|
||||
gtkdebug.h \
|
||||
gtkdialog.h \
|
||||
gtkdnd.h \
|
||||
@ -271,7 +269,7 @@ gtk_public_h_sources = \
|
||||
gtkoldeditable.h \
|
||||
gtkobject.h \
|
||||
gtkoptionmenu.h \
|
||||
gtkpacker.h \
|
||||
# gtkpacker.h \
|
||||
gtkpaned.h \
|
||||
# gdk-pixbuf-loader.h \
|
||||
gtkpixmap.h \
|
||||
@ -290,6 +288,7 @@ gtk_public_h_sources = \
|
||||
gtkscrolledwindow.h \
|
||||
gtkselection.h \
|
||||
gtkseparator.h \
|
||||
gtksizegroup.h \
|
||||
gtksignal.h \
|
||||
gtksocket.h \
|
||||
gtkspinbutton.h \
|
||||
@ -315,7 +314,7 @@ gtk_public_h_sources = \
|
||||
gtktree.h \
|
||||
gtktreeitem.h \
|
||||
gtktreemodel.h \
|
||||
gtktreemodelsimple.h \
|
||||
# gtktreemodelsimple.h \
|
||||
gtktreemodelsort.h \
|
||||
gtktreeselection.h \
|
||||
gtktreesortable.h \
|
||||
@ -334,6 +333,14 @@ gtk_public_h_sources = \
|
||||
gtkwidget.h \
|
||||
gtkwindow.h
|
||||
|
||||
# these aren't use here, but listed for reference
|
||||
gtk_extra_sources = \
|
||||
gtkcompat.h \
|
||||
maketypes.awk \
|
||||
makeenums.h \
|
||||
gtk-boxed.defs \
|
||||
gtkmarshal.list \
|
||||
|
||||
..\config.h : ..\config.h.win32
|
||||
copy ..\config.h.win32 ..\config.h
|
||||
|
||||
@ -345,7 +352,7 @@ GENERATED = gtk.defs gtktypebuiltins.h gtktypebuiltins_vars.c gtktypebuiltins_id
|
||||
generated : $(GENERATED)
|
||||
$(TOUCH) generated
|
||||
|
||||
gtk.defs : makeenums.pl gtk-boxed.defs $(gtk_public_h_sources)
|
||||
gtk.defs : makeenums.pl gtk-boxed.defs $(gtk_public_h_sources) makefile.msc
|
||||
$(PERL) makeenums.pl defs $(gtk_public_h_sources) >gd.tmp
|
||||
copy gd.tmp+gtk-boxed.defs gtk.defs
|
||||
@erase gd.tmp
|
||||
@ -379,7 +386,10 @@ gtksignal.obj : gtksignal.c gtkmarshal.c gtkmarshal.h
|
||||
# Linking:
|
||||
#
|
||||
gtk-win32-$(GTK_VER).dll : $(gtk_OBJECTS) gtk.def
|
||||
$(CC) $(CFLAGS) -LD -Fegtk-win32-$(GTK_VER).dll $(gtk_OBJECTS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(INTL_LIBS) $(GLIB_LIBS) gdi32.lib user32.lib advapi32.lib $(LDFLAGS) /def:gtk.def
|
||||
$(CC) $(CFLAGS) -LD -Fm -Fegtk-win32-$(GTK_VER).dll $(gtk_OBJECTS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(INTL_LIBS) $(GLIB_LIBS) gdi32.lib user32.lib advapi32.lib $(LDFLAGS) /def:gtk.def
|
||||
|
||||
gtk-win32-$(GTK_VER)s.lib : $(gtk_OBJECTS)
|
||||
lib /out:gtk-win32-$(GTK_VER)s.lib $(gtk_OBJECTS)
|
||||
|
||||
# General rule for compiling the objects into the DLL
|
||||
.c.obj :
|
||||
|
||||
Loading…
Reference in New Issue
Block a user