diff options
Diffstat (limited to 'bundles')
4 files changed, 23 insertions, 4 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 da633ec54d..42f60312dc 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 @@ -787,6 +787,12 @@ OS_g_log_set_handler_3=cast=(gpointer) OS_g_malloc= OS_g_malloc_0=cast=(gulong) +OS_g_object_get= +OS_g_object_get_0=cast=GObject * +OS_g_object_get_1=cast=(const gchar *),flags=no_out +OS_g_object_get_2= +OS_g_object_get_3= + OS_g_object_get_qdata= OS_g_object_get_qdata_0=cast=(GObject *) OS_g_object_get_qdata_1=cast=(GQuark) @@ -1361,6 +1367,9 @@ OS_gdk_pixbuf_scale_simple_1= OS_gdk_pixbuf_scale_simple_2= OS_gdk_pixbuf_scale_simple_3=cast=(GdkInterpType) +OS_gdk_pixmap_foreign_new= +OS_gdk_pixmap_foreign_new_0= + OS_gdk_pixmap_new= OS_gdk_pixmap_new_0=cast=(GdkWindow *) OS_gdk_pixmap_new_1=cast=(gint) @@ -2446,6 +2455,8 @@ OS_gtk_separator_menu_item_new= OS_gtk_set_locale= +OS_gtk_settings_get_default= + OS_gtk_socket_get_id= OS_gtk_socket_get_id_0=cast=GtkSocket * 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 217fcf7989..e97eff1907 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 @@ -392,6 +392,7 @@ public class OS { public static final int XmNarrowSpacing = malloc ("arrowSpacing", 2); public static final int XmNbackground = malloc ("background", 4); public static final int XmNblendModel = malloc ("blendModel", 1); + public static final int XmNblinkRate = malloc ("blinkRate", 4); public static final int XmNborderColor = malloc ("borderColor", 4); public static final int XmNborderWidth = malloc ("borderWidth", 2); public static final int XmNbottomAttachment = malloc ("bottomAttachment", 1); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Caret.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Caret.java index 6bc7d24ceb..26f70d2563 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Caret.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Caret.java @@ -33,7 +33,7 @@ public class Caret extends Widget { Canvas parent; int x, y, width, height; boolean isVisible, isShowing; - int blinkRate = 500; + int blinkRate; Image image; Font font; /** @@ -77,6 +77,7 @@ boolean blinkCaret () { } void createWidget (int index) { super.createWidget (index); + blinkRate = display.getCaretBlinkTime (); isVisible = true; if (parent.getCaret () == null) { parent.setCaret (this); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Display.java index 4325b758d3..db2f56802e 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Display.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Display.java @@ -129,7 +129,7 @@ public class Display extends Device { int labelBackground, labelForeground, scrollBarBackground, scrollBarForeground; int scrolledInsetX, scrolledInsetY, scrolledMarginX, scrolledMarginY; int defaultBackground, defaultForeground; - int textHighlightThickness; + int textHighlightThickness, blinkRate; /* System Colors */ XColor COLOR_WIDGET_DARK_SHADOW, COLOR_WIDGET_NORMAL_SHADOW, COLOR_WIDGET_LIGHT_SHADOW; @@ -1136,6 +1136,10 @@ public static synchronized Display findDisplay (Thread thread) { } return null; } +int getCaretBlinkTime () { +// checkDevice (); + return blinkRate; +} /** * Returns the control which the on-screen pointer is currently * over top of, or null if it is not currently over one of the @@ -2198,10 +2202,12 @@ void initializeText () { OS.XtManageChild (widgetHandle); OS.XtSetMappedWhenManaged (shellHandle, false); OS.XtRealizeWidget (shellHandle); - int [] argList = {OS.XmNforeground, 0, OS.XmNbackground, 0, OS.XmNfontList, 0, OS.XmNhighlightThickness, 0}; + int [] argList = {OS.XmNforeground, 0, OS.XmNbackground, 0, OS.XmNfontList, 0, OS.XmNhighlightThickness, 0, OS.XmNblinkRate, 0}; OS.XtGetValues (widgetHandle, argList, argList.length / 2); - textForeground = argList [1]; textBackground = argList [3]; + textForeground = argList [1]; + textBackground = argList [3]; textHighlightThickness = argList[7]; + blinkRate = argList[9]; /* * Feature in Motif. Querying the font list from the widget and * then destroying the shell (and the widget) could cause the |