diff options
8 files changed, 225 insertions, 176 deletions
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gtk.OS.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gtk.OS.properties index 532ec9d112..3059fb58ad 100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gtk.OS.properties +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gtk.OS.properties @@ -2897,6 +2897,9 @@ OS_gtk_widget_get_default_style= OS_gtk_widget_get_direction= OS_gtk_widget_get_direction_0=cast=(GtkWidget *) +OS_gtk_widget_get_events= +OS_gtk_widget_get_events_0=cast=GtkWidget * + OS_gtk_widget_get_modifier_style= OS_gtk_widget_get_modifier_style_0=cast=(GtkWidget *) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c index 8c5ecf58d6..0961fef1aa 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c @@ -8231,6 +8231,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(gtk_1widget_1get_1direction) } #endif +#ifndef NO_gtk_1widget_1get_1events +JNIEXPORT jint JNICALL OS_NATIVE(gtk_1widget_1get_1events) + (JNIEnv *env, jclass that, jint arg0) +{ + jint rc; + OS_NATIVE_ENTER(env, that, gtk_1widget_1get_1events_FUNC); + rc = (jint)gtk_widget_get_events((GtkWidget *)arg0); + OS_NATIVE_EXIT(env, that, gtk_1widget_1get_1events_FUNC); + return rc; +} +#endif + #ifndef NO_gtk_1widget_1get_1modifier_1style JNIEXPORT jint JNICALL OS_NATIVE(gtk_1widget_1get_1modifier_1style) (JNIEnv *env, jclass that, jint arg0) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c index d7de96bacb..42374babd3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c @@ -18,8 +18,8 @@ #ifdef NATIVE_STATS -int OS_nativeFunctionCount = 828; -int OS_nativeFunctionCallCount[828]; +int OS_nativeFunctionCount = 829; +int OS_nativeFunctionCallCount[829]; char * OS_nativeFunctionNames[] = { "GDK_1DISPLAY", "GDK_1ROOT_1PARENT", @@ -679,6 +679,7 @@ char * OS_nativeFunctionNames[] = { "gtk_1widget_1get_1default_1direction", "gtk_1widget_1get_1default_1style", "gtk_1widget_1get_1direction", + "gtk_1widget_1get_1events", "gtk_1widget_1get_1modifier_1style", "gtk_1widget_1get_1pango_1context", "gtk_1widget_1get_1parent", diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h index 653f1c304f..e9e88ea1aa 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h @@ -681,173 +681,174 @@ char* OS_nativeFunctionNames[]; #define gtk_1widget_1get_1default_1direction_FUNC 655 #define gtk_1widget_1get_1default_1style_FUNC 656 #define gtk_1widget_1get_1direction_FUNC 657 -#define gtk_1widget_1get_1modifier_1style_FUNC 658 -#define gtk_1widget_1get_1pango_1context_FUNC 659 -#define gtk_1widget_1get_1parent_FUNC 660 -#define gtk_1widget_1get_1style_FUNC 661 -#define gtk_1widget_1grab_1focus_FUNC 662 -#define gtk_1widget_1hide_FUNC 663 -#define gtk_1widget_1is_1focus_FUNC 664 -#define gtk_1widget_1mnemonic_1activate_FUNC 665 -#define gtk_1widget_1modify_1base_FUNC 666 -#define gtk_1widget_1modify_1bg_FUNC 667 -#define gtk_1widget_1modify_1fg_FUNC 668 -#define gtk_1widget_1modify_1font_FUNC 669 -#define gtk_1widget_1modify_1style_FUNC 670 -#define gtk_1widget_1modify_1text_FUNC 671 -#define gtk_1widget_1realize_FUNC 672 -#define gtk_1widget_1remove_1accelerator_FUNC 673 -#define gtk_1widget_1reparent_FUNC 674 -#define gtk_1widget_1set_1default_1direction_FUNC 675 -#define gtk_1widget_1set_1direction_FUNC 676 -#define gtk_1widget_1set_1double_1buffered_FUNC 677 -#define gtk_1widget_1set_1name_FUNC 678 -#define gtk_1widget_1set_1redraw_1on_1allocate_FUNC 679 -#define gtk_1widget_1set_1sensitive_FUNC 680 -#define gtk_1widget_1set_1size_1request_FUNC 681 -#define gtk_1widget_1set_1state_FUNC 682 -#define gtk_1widget_1shape_1combine_1mask_FUNC 683 -#define gtk_1widget_1show_FUNC 684 -#define gtk_1widget_1show_1now_FUNC 685 -#define gtk_1widget_1size_1allocate_FUNC 686 -#define gtk_1widget_1size_1request_FUNC 687 -#define gtk_1widget_1style_1get_FUNC 688 -#define gtk_1widget_1unrealize_FUNC 689 -#define gtk_1window_1activate_1default_FUNC 690 -#define gtk_1window_1add_1accel_1group_FUNC 691 -#define gtk_1window_1deiconify_FUNC 692 -#define gtk_1window_1get_1focus_FUNC 693 -#define gtk_1window_1get_1mnemonic_1modifier_FUNC 694 -#define gtk_1window_1get_1position_FUNC 695 -#define gtk_1window_1get_1size_FUNC 696 -#define gtk_1window_1iconify_FUNC 697 -#define gtk_1window_1maximize_FUNC 698 -#define gtk_1window_1move_FUNC 699 -#define gtk_1window_1new_FUNC 700 -#define gtk_1window_1present_FUNC 701 -#define gtk_1window_1remove_1accel_1group_FUNC 702 -#define gtk_1window_1resize_FUNC 703 -#define gtk_1window_1set_1default_FUNC 704 -#define gtk_1window_1set_1destroy_1with_1parent_FUNC 705 -#define gtk_1window_1set_1modal_FUNC 706 -#define gtk_1window_1set_1resizable_FUNC 707 -#define gtk_1window_1set_1title_FUNC 708 -#define gtk_1window_1set_1transient_1for_FUNC 709 -#define gtk_1window_1set_1type_1hint_FUNC 710 -#define gtk_1window_1unmaximize_FUNC 711 -#define memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I_FUNC 712 -#define memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2_FUNC 713 -#define memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2_FUNC 714 -#define memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I_FUNC 715 -#define memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I_FUNC 716 -#define memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I_FUNC 717 -#define memmove__I_3BI_FUNC 718 -#define memmove__I_3II_FUNC 719 -#define memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2II_FUNC 720 -#define memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2II_FUNC 721 -#define memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II_FUNC 722 -#define memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II_FUNC 723 -#define memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II_FUNC 724 -#define memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II_FUNC 725 -#define memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II_FUNC 726 -#define memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II_FUNC 727 -#define memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2II_FUNC 728 -#define memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I_FUNC 729 -#define memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II_FUNC 730 -#define memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I_FUNC 731 -#define memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I_FUNC 732 -#define memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I_FUNC 733 -#define memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I_FUNC 734 -#define memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I_FUNC 735 -#define memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I_FUNC 736 -#define memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2II_FUNC 737 -#define memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2II_FUNC 738 -#define memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II_FUNC 739 -#define memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II_FUNC 740 -#define memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II_FUNC 741 -#define memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II_FUNC 742 -#define memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II_FUNC 743 -#define memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II_FUNC 744 -#define memmove___3BII_FUNC 745 -#define memmove___3CII_FUNC 746 -#define memmove___3III_FUNC 747 -#define memmove___3I_3BI_FUNC 748 -#define memmove___3JII_FUNC 749 -#define memset_FUNC 750 -#define pango_1attr_1background_1new_FUNC 751 -#define pango_1attr_1font_1desc_1new_FUNC 752 -#define pango_1attr_1foreground_1new_FUNC 753 -#define pango_1attr_1list_1change_FUNC 754 -#define pango_1attr_1list_1insert_FUNC 755 -#define pango_1attr_1list_1new_FUNC 756 -#define pango_1attr_1list_1unref_FUNC 757 -#define pango_1attr_1shape_1new_FUNC 758 -#define pango_1attr_1strikethrough_1new_FUNC 759 -#define pango_1attr_1underline_1new_FUNC 760 -#define pango_1attr_1weight_1new_FUNC 761 -#define pango_1context_1get_1base_1dir_FUNC 762 -#define pango_1context_1get_1language_FUNC 763 -#define pango_1context_1get_1metrics_FUNC 764 -#define pango_1context_1list_1families_FUNC 765 -#define pango_1context_1set_1base_1dir_FUNC 766 -#define pango_1context_1set_1language_FUNC 767 -#define pango_1font_1description_1copy_FUNC 768 -#define pango_1font_1description_1free_FUNC 769 -#define pango_1font_1description_1from_1string_FUNC 770 -#define pango_1font_1description_1get_1family_FUNC 771 -#define pango_1font_1description_1get_1size_FUNC 772 -#define pango_1font_1description_1get_1style_FUNC 773 -#define pango_1font_1description_1get_1weight_FUNC 774 -#define pango_1font_1description_1new_FUNC 775 -#define pango_1font_1description_1set_1family_FUNC 776 -#define pango_1font_1description_1set_1size_FUNC 777 -#define pango_1font_1description_1set_1stretch_FUNC 778 -#define pango_1font_1description_1set_1style_FUNC 779 -#define pango_1font_1description_1set_1weight_FUNC 780 -#define pango_1font_1description_1to_1string_FUNC 781 -#define pango_1font_1face_1describe_FUNC 782 -#define pango_1font_1family_1list_1faces_FUNC 783 -#define pango_1font_1get_1metrics_FUNC 784 -#define pango_1font_1metrics_1get_1approximate_1char_1width_FUNC 785 -#define pango_1font_1metrics_1get_1ascent_FUNC 786 -#define pango_1font_1metrics_1get_1descent_FUNC 787 -#define pango_1font_1metrics_1unref_FUNC 788 -#define pango_1language_1from_1string_FUNC 789 -#define pango_1layout_1context_1changed_FUNC 790 -#define pango_1layout_1get_1alignment_FUNC 791 -#define pango_1layout_1get_1attributes_FUNC 792 -#define pango_1layout_1get_1iter_FUNC 793 -#define pango_1layout_1get_1line_FUNC 794 -#define pango_1layout_1get_1line_1count_FUNC 795 -#define pango_1layout_1get_1log_1attrs_FUNC 796 -#define pango_1layout_1get_1size_FUNC 797 -#define pango_1layout_1get_1spacing_FUNC 798 -#define pango_1layout_1get_1tabs_FUNC 799 -#define pango_1layout_1get_1text_FUNC 800 -#define pango_1layout_1get_1width_FUNC 801 -#define pango_1layout_1index_1to_1pos_FUNC 802 -#define pango_1layout_1iter_1free_FUNC 803 -#define pango_1layout_1iter_1get_1index_FUNC 804 -#define pango_1layout_1iter_1get_1line_1extents_FUNC 805 -#define pango_1layout_1iter_1get_1run_FUNC 806 -#define pango_1layout_1iter_1next_1line_FUNC 807 -#define pango_1layout_1iter_1next_1run_FUNC 808 -#define pango_1layout_1line_1get_1extents_FUNC 809 -#define pango_1layout_1line_1x_1to_1index_FUNC 810 -#define pango_1layout_1new_FUNC 811 -#define pango_1layout_1set_1alignment_FUNC 812 -#define pango_1layout_1set_1attributes_FUNC 813 -#define pango_1layout_1set_1font_1description_FUNC 814 -#define pango_1layout_1set_1single_1paragraph_1mode_FUNC 815 -#define pango_1layout_1set_1spacing_FUNC 816 -#define pango_1layout_1set_1tabs_FUNC 817 -#define pango_1layout_1set_1text_FUNC 818 -#define pango_1layout_1set_1width_FUNC 819 -#define pango_1layout_1set_1wrap_FUNC 820 -#define pango_1layout_1xy_1to_1index_FUNC 821 -#define pango_1tab_1array_1free_FUNC 822 -#define pango_1tab_1array_1get_1size_FUNC 823 -#define pango_1tab_1array_1get_1tabs_FUNC 824 -#define pango_1tab_1array_1new_FUNC 825 -#define pango_1tab_1array_1set_1tab_FUNC 826 -#define strlen_FUNC 827 +#define gtk_1widget_1get_1events_FUNC 658 +#define gtk_1widget_1get_1modifier_1style_FUNC 659 +#define gtk_1widget_1get_1pango_1context_FUNC 660 +#define gtk_1widget_1get_1parent_FUNC 661 +#define gtk_1widget_1get_1style_FUNC 662 +#define gtk_1widget_1grab_1focus_FUNC 663 +#define gtk_1widget_1hide_FUNC 664 +#define gtk_1widget_1is_1focus_FUNC 665 +#define gtk_1widget_1mnemonic_1activate_FUNC 666 +#define gtk_1widget_1modify_1base_FUNC 667 +#define gtk_1widget_1modify_1bg_FUNC 668 +#define gtk_1widget_1modify_1fg_FUNC 669 +#define gtk_1widget_1modify_1font_FUNC 670 +#define gtk_1widget_1modify_1style_FUNC 671 +#define gtk_1widget_1modify_1text_FUNC 672 +#define gtk_1widget_1realize_FUNC 673 +#define gtk_1widget_1remove_1accelerator_FUNC 674 +#define gtk_1widget_1reparent_FUNC 675 +#define gtk_1widget_1set_1default_1direction_FUNC 676 +#define gtk_1widget_1set_1direction_FUNC 677 +#define gtk_1widget_1set_1double_1buffered_FUNC 678 +#define gtk_1widget_1set_1name_FUNC 679 +#define gtk_1widget_1set_1redraw_1on_1allocate_FUNC 680 +#define gtk_1widget_1set_1sensitive_FUNC 681 +#define gtk_1widget_1set_1size_1request_FUNC 682 +#define gtk_1widget_1set_1state_FUNC 683 +#define gtk_1widget_1shape_1combine_1mask_FUNC 684 +#define gtk_1widget_1show_FUNC 685 +#define gtk_1widget_1show_1now_FUNC 686 +#define gtk_1widget_1size_1allocate_FUNC 687 +#define gtk_1widget_1size_1request_FUNC 688 +#define gtk_1widget_1style_1get_FUNC 689 +#define gtk_1widget_1unrealize_FUNC 690 +#define gtk_1window_1activate_1default_FUNC 691 +#define gtk_1window_1add_1accel_1group_FUNC 692 +#define gtk_1window_1deiconify_FUNC 693 +#define gtk_1window_1get_1focus_FUNC 694 +#define gtk_1window_1get_1mnemonic_1modifier_FUNC 695 +#define gtk_1window_1get_1position_FUNC 696 +#define gtk_1window_1get_1size_FUNC 697 +#define gtk_1window_1iconify_FUNC 698 +#define gtk_1window_1maximize_FUNC 699 +#define gtk_1window_1move_FUNC 700 +#define gtk_1window_1new_FUNC 701 +#define gtk_1window_1present_FUNC 702 +#define gtk_1window_1remove_1accel_1group_FUNC 703 +#define gtk_1window_1resize_FUNC 704 +#define gtk_1window_1set_1default_FUNC 705 +#define gtk_1window_1set_1destroy_1with_1parent_FUNC 706 +#define gtk_1window_1set_1modal_FUNC 707 +#define gtk_1window_1set_1resizable_FUNC 708 +#define gtk_1window_1set_1title_FUNC 709 +#define gtk_1window_1set_1transient_1for_FUNC 710 +#define gtk_1window_1set_1type_1hint_FUNC 711 +#define gtk_1window_1unmaximize_FUNC 712 +#define memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I_FUNC 713 +#define memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2_FUNC 714 +#define memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2_FUNC 715 +#define memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I_FUNC 716 +#define memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I_FUNC 717 +#define memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I_FUNC 718 +#define memmove__I_3BI_FUNC 719 +#define memmove__I_3II_FUNC 720 +#define memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2II_FUNC 721 +#define memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2II_FUNC 722 +#define memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II_FUNC 723 +#define memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II_FUNC 724 +#define memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II_FUNC 725 +#define memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II_FUNC 726 +#define memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II_FUNC 727 +#define memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II_FUNC 728 +#define memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2II_FUNC 729 +#define memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I_FUNC 730 +#define memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II_FUNC 731 +#define memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I_FUNC 732 +#define memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I_FUNC 733 +#define memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I_FUNC 734 +#define memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I_FUNC 735 +#define memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I_FUNC 736 +#define memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I_FUNC 737 +#define memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2II_FUNC 738 +#define memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2II_FUNC 739 +#define memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II_FUNC 740 +#define memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II_FUNC 741 +#define memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II_FUNC 742 +#define memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II_FUNC 743 +#define memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II_FUNC 744 +#define memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II_FUNC 745 +#define memmove___3BII_FUNC 746 +#define memmove___3CII_FUNC 747 +#define memmove___3III_FUNC 748 +#define memmove___3I_3BI_FUNC 749 +#define memmove___3JII_FUNC 750 +#define memset_FUNC 751 +#define pango_1attr_1background_1new_FUNC 752 +#define pango_1attr_1font_1desc_1new_FUNC 753 +#define pango_1attr_1foreground_1new_FUNC 754 +#define pango_1attr_1list_1change_FUNC 755 +#define pango_1attr_1list_1insert_FUNC 756 +#define pango_1attr_1list_1new_FUNC 757 +#define pango_1attr_1list_1unref_FUNC 758 +#define pango_1attr_1shape_1new_FUNC 759 +#define pango_1attr_1strikethrough_1new_FUNC 760 +#define pango_1attr_1underline_1new_FUNC 761 +#define pango_1attr_1weight_1new_FUNC 762 +#define pango_1context_1get_1base_1dir_FUNC 763 +#define pango_1context_1get_1language_FUNC 764 +#define pango_1context_1get_1metrics_FUNC 765 +#define pango_1context_1list_1families_FUNC 766 +#define pango_1context_1set_1base_1dir_FUNC 767 +#define pango_1context_1set_1language_FUNC 768 +#define pango_1font_1description_1copy_FUNC 769 +#define pango_1font_1description_1free_FUNC 770 +#define pango_1font_1description_1from_1string_FUNC 771 +#define pango_1font_1description_1get_1family_FUNC 772 +#define pango_1font_1description_1get_1size_FUNC 773 +#define pango_1font_1description_1get_1style_FUNC 774 +#define pango_1font_1description_1get_1weight_FUNC 775 +#define pango_1font_1description_1new_FUNC 776 +#define pango_1font_1description_1set_1family_FUNC 777 +#define pango_1font_1description_1set_1size_FUNC 778 +#define pango_1font_1description_1set_1stretch_FUNC 779 +#define pango_1font_1description_1set_1style_FUNC 780 +#define pango_1font_1description_1set_1weight_FUNC 781 +#define pango_1font_1description_1to_1string_FUNC 782 +#define pango_1font_1face_1describe_FUNC 783 +#define pango_1font_1family_1list_1faces_FUNC 784 +#define pango_1font_1get_1metrics_FUNC 785 +#define pango_1font_1metrics_1get_1approximate_1char_1width_FUNC 786 +#define pango_1font_1metrics_1get_1ascent_FUNC 787 +#define pango_1font_1metrics_1get_1descent_FUNC 788 +#define pango_1font_1metrics_1unref_FUNC 789 +#define pango_1language_1from_1string_FUNC 790 +#define pango_1layout_1context_1changed_FUNC 791 +#define pango_1layout_1get_1alignment_FUNC 792 +#define pango_1layout_1get_1attributes_FUNC 793 +#define pango_1layout_1get_1iter_FUNC 794 +#define pango_1layout_1get_1line_FUNC 795 +#define pango_1layout_1get_1line_1count_FUNC 796 +#define pango_1layout_1get_1log_1attrs_FUNC 797 +#define pango_1layout_1get_1size_FUNC 798 +#define pango_1layout_1get_1spacing_FUNC 799 +#define pango_1layout_1get_1tabs_FUNC 800 +#define pango_1layout_1get_1text_FUNC 801 +#define pango_1layout_1get_1width_FUNC 802 +#define pango_1layout_1index_1to_1pos_FUNC 803 +#define pango_1layout_1iter_1free_FUNC 804 +#define pango_1layout_1iter_1get_1index_FUNC 805 +#define pango_1layout_1iter_1get_1line_1extents_FUNC 806 +#define pango_1layout_1iter_1get_1run_FUNC 807 +#define pango_1layout_1iter_1next_1line_FUNC 808 +#define pango_1layout_1iter_1next_1run_FUNC 809 +#define pango_1layout_1line_1get_1extents_FUNC 810 +#define pango_1layout_1line_1x_1to_1index_FUNC 811 +#define pango_1layout_1new_FUNC 812 +#define pango_1layout_1set_1alignment_FUNC 813 +#define pango_1layout_1set_1attributes_FUNC 814 +#define pango_1layout_1set_1font_1description_FUNC 815 +#define pango_1layout_1set_1single_1paragraph_1mode_FUNC 816 +#define pango_1layout_1set_1spacing_FUNC 817 +#define pango_1layout_1set_1tabs_FUNC 818 +#define pango_1layout_1set_1text_FUNC 819 +#define pango_1layout_1set_1width_FUNC 820 +#define pango_1layout_1set_1wrap_FUNC 821 +#define pango_1layout_1xy_1to_1index_FUNC 822 +#define pango_1tab_1array_1free_FUNC 823 +#define pango_1tab_1array_1get_1size_FUNC 824 +#define pango_1tab_1array_1get_1tabs_FUNC 825 +#define pango_1tab_1array_1new_FUNC 826 +#define pango_1tab_1array_1set_1tab_FUNC 827 +#define strlen_FUNC 828 diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java index 1a157a7f65..491e780603 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java @@ -37,6 +37,10 @@ public class OS { public static final int GDK_BUTTON1_MASK = 0x100; public static final int GDK_BUTTON2_MASK = 0x200; public static final int GDK_BUTTON3_MASK = 0x400; + public static final int GDK_BUTTON_MOTION_MASK = 1 << 4; + public static final int GDK_BUTTON1_MOTION_MASK = 1 << 5; + public static final int GDK_BUTTON2_MOTION_MASK = 1 << 6; + public static final int GDK_BUTTON3_MOTION_MASK = 1 << 7; public static final int GDK_BUTTON_PRESS = 0x4; public static final int GDK_BUTTON_PRESS_MASK = 0x100; public static final int GDK_BUTTON_RELEASE = 0x7; @@ -1037,6 +1041,7 @@ public static final synchronized native boolean gtk_widget_event(int /*long*/ wi public static final synchronized native int gtk_widget_get_default_direction(); public static final synchronized native int /*long*/ gtk_widget_get_default_style(); public static final synchronized native int gtk_widget_get_direction(int /*long*/ widget); +public static final synchronized native int gtk_widget_get_events(int /*long*/ widget); public static final synchronized native int /*long*/ gtk_widget_get_modifier_style(int /*long*/ widget); public static final synchronized native int /*long*/ gtk_widget_get_pango_context(int /*long*/ widget); public static final synchronized native int /*long*/ gtk_widget_get_parent(int /*long*/ widget); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/OS.java index 5cdc1c1b91..cd0efe57a5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/OS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/OS.java @@ -57,6 +57,12 @@ public class OS { public static final int ButtonPressMask = 1 << 2; public static final int ButtonRelease = 5; public static final int ButtonReleaseMask = 1 << 3; + public static final int ButtonMotionMask = 1 << 13; + public static final int Button1MotionMask = 1 << 8; + public static final int Button2MotionMask = 1 << 9; + public static final int Button3MotionMask = 1 << 10; + public static final int Button4MotionMask = 1 << 11; + public static final int Button5MotionMask = 1 << 12; public static final int CWBackPixmap = 0x1; public static final int CWBitGravity = 0x10; public static final int CWCursor = 0x4000; @@ -141,6 +147,7 @@ public class OS { public static final int PMinSize = 1 << 4; public static final int PMaxSize = 1 << 5; public static final int PointerMotionMask = 1 << 6; + public static final int PointerMotionHintMask = 1 << 7; public static final int PropertyChangeMask = 1 << 22; public static final int PropertyNotify = 28; public static final int PropModeReplace = 0; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java index 00bf5cadeb..7b3a07601b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java @@ -2716,7 +2716,9 @@ public void setRedraw (boolean redraw) { if (redraw) { if (--drawCount == 0) { if (redrawWindow != 0) { + int /*long*/ window = paintWindow (); OS.gdk_window_destroy (redrawWindow); + OS.gdk_window_set_events (window, OS.gtk_widget_get_events (paintHandle ())); redrawWindow = 0; } } @@ -2732,6 +2734,12 @@ public void setRedraw (boolean redraw) { attributes.window_type = OS.GDK_WINDOW_CHILD; redrawWindow = OS.gdk_window_new (window, attributes, 0); if (redrawWindow != 0) { + int mouseMask = OS.GDK_BUTTON_PRESS_MASK | OS.GDK_BUTTON_RELEASE_MASK | + OS.GDK_ENTER_NOTIFY_MASK | OS.GDK_LEAVE_NOTIFY_MASK | + OS.GDK_POINTER_MOTION_MASK | OS.GDK_POINTER_MOTION_HINT_MASK | + OS.GDK_BUTTON_MOTION_MASK | OS.GDK_BUTTON1_MOTION_MASK | + OS.GDK_BUTTON2_MOTION_MASK | OS.GDK_BUTTON3_MOTION_MASK; + OS.gdk_window_set_events (window, OS.gdk_window_get_events (window) & ~mouseMask); OS.gdk_window_set_back_pixmap (redrawWindow, 0, false); OS.gdk_window_raise (redrawWindow); OS.gdk_window_show (redrawWindow); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Control.java index f756e00f89..ff85b69042 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Control.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Control.java @@ -2310,8 +2310,12 @@ public void setRedraw (boolean redraw) { if (redraw) { if (--drawCount == 0) { if (redrawWindow != 0) { - int xDisplay = OS.XtDisplay(handle); - OS.XDestroyWindow(xDisplay, redrawWindow); + int xDisplay = OS.XtDisplay (handle); + if (xDisplay == 0) return; + int xWindow = OS.XtWindow (handle); + if (xWindow == 0) return; + OS.XDestroyWindow (xDisplay, redrawWindow); + OS.XSelectInput (xDisplay, xWindow, OS.XtBuildEventMask (handle)); redrawWindow = 0; } } @@ -2328,8 +2332,16 @@ public void setRedraw (boolean redraw) { int mask = OS.CWDontPropagate | OS.CWEventMask | OS.CWBackPixmap; redrawWindow = OS.XCreateWindow (xDisplay, xWindow, 0, 0, rect.width, rect.height, 0,OS.CopyFromParent, OS.CopyFromParent, OS.CopyFromParent, mask, attributes); - OS.XRaiseWindow (xDisplay, redrawWindow); - OS.XMapWindow (xDisplay, redrawWindow); + if (redrawWindow != 0) { + int mouseMask = OS.ButtonPressMask | OS.ButtonReleaseMask | + OS.LeaveWindowMask | OS.PointerMotionMask | + OS.PointerMotionMask | OS.PointerMotionHintMask | + OS.ButtonMotionMask | OS.Button1MotionMask | OS.Button2MotionMask | + OS.Button3MotionMask | OS.Button4MotionMask | OS.Button5MotionMask; + OS.XSelectInput (xDisplay, xWindow, OS.XtBuildEventMask (handle) & ~mouseMask); + OS.XRaiseWindow (xDisplay, redrawWindow); + OS.XMapWindow (xDisplay, redrawWindow); + } } } } |