aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2012-01-24 17:36:23 (EST)
committerSilenio Quarti2012-01-31 17:36:01 (EST)
commit5db5c1dca04aab70c6da0d8e51099b4a60336357 (patch)
tree89909c4afa3548e7b41b7fd20a7fe8318285913d
parent0fc9a694d7469800fdb4849776d3de00cc1d2797 (diff)
downloadeclipse.platform.swt-5db5c1dca04aab70c6da0d8e51099b4a60336357.zip
eclipse.platform.swt-5db5c1dca04aab70c6da0d8e51099b4a60336357.tar.gz
eclipse.platform.swt-5db5c1dca04aab70c6da0d8e51099b4a60336357.tar.bz2
Get rid of gtk_calendar_display_options.
This function has been used only for pre-2.4 GTK, is deprecated for long time and is removed in GTK 3.
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c18
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c5
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java14
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java6
5 files changed, 3 insertions, 41 deletions
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 b7aca3f..511f2aa 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
@@ -7702,24 +7702,6 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1clear_1marks)
}
#endif
-#ifndef NO__1gtk_1calendar_1display_1options
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1display_1options)
- (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-{
- OS_NATIVE_ENTER(env, that, _1gtk_1calendar_1display_1options_FUNC);
-/*
- gtk_calendar_display_options((GtkCalendar *)arg0, (GtkCalendarDisplayOptions)arg1);
-*/
- {
- OS_LOAD_FUNCTION(fp, gtk_calendar_display_options)
- if (fp) {
- ((void (CALLING_CONVENTION*)(GtkCalendar *, GtkCalendarDisplayOptions))fp)((GtkCalendar *)arg0, (GtkCalendarDisplayOptions)arg1);
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1calendar_1display_1options_FUNC);
-}
-#endif
-
#ifndef NO__1gtk_1calendar_1get_1date
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1get_1date)
(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2, jintArray arg3)
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 e3e9a7d..fc78945 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 = 1380;
-int OS_nativeFunctionCallCount[1380];
+int OS_nativeFunctionCount = 1379;
+int OS_nativeFunctionCallCount[1379];
char * OS_nativeFunctionNames[] = {
#ifndef JNI64
"Call__IIII",
@@ -631,7 +631,6 @@ char * OS_nativeFunctionNames[] = {
"_1gtk_1button_1new",
"_1gtk_1button_1set_1relief",
"_1gtk_1calendar_1clear_1marks",
- "_1gtk_1calendar_1display_1options",
"_1gtk_1calendar_1get_1date",
"_1gtk_1calendar_1mark_1day",
"_1gtk_1calendar_1new",
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 494ac90..311f8be 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
@@ -639,7 +639,6 @@ typedef enum {
_1gtk_1button_1new_FUNC,
_1gtk_1button_1set_1relief_FUNC,
_1gtk_1calendar_1clear_1marks_FUNC,
- _1gtk_1calendar_1display_1options_FUNC,
_1gtk_1calendar_1get_1date_FUNC,
_1gtk_1calendar_1mark_1day_FUNC,
_1gtk_1calendar_1new_FUNC,
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 c43f396..95aba41 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
@@ -6084,20 +6084,6 @@ public static final void gtk_calendar_set_display_options(int /*long*/ calendar,
/**
* @method flags=dynamic
* @param calendar cast=(GtkCalendar *)
- * @param flags cast=(GtkCalendarDisplayOptions)
- */
-public static final native void _gtk_calendar_display_options(int /*long*/ calendar, int flags);
-public static final void gtk_calendar_display_options(int /*long*/ calendar, int flags) {
- lock.lock();
- try {
- _gtk_calendar_display_options(calendar, flags);
- } finally {
- lock.unlock();
- }
-}
-/**
- * @method flags=dynamic
- * @param calendar cast=(GtkCalendar *)
* @param year cast=(guint *)
* @param month cast=(guint *)
* @param day cast=(guint *)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java
index 0d8c809..020e8a9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java
@@ -343,11 +343,7 @@ void createHandle (int index) {
handle = OS.gtk_calendar_new ();
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_container_add (fixedHandle, handle);
- if (OS.GTK_VERSION >= OS.VERSION(2, 4, 0)) {
- OS.gtk_calendar_set_display_options(handle, OS.GTK_CALENDAR_SHOW_HEADING | OS.GTK_CALENDAR_SHOW_DAY_NAMES);
- } else {
- OS.gtk_calendar_display_options(handle, OS.GTK_CALENDAR_SHOW_HEADING | OS.GTK_CALENDAR_SHOW_DAY_NAMES);
- }
+ OS.gtk_calendar_set_display_options(handle, OS.GTK_CALENDAR_SHOW_HEADING | OS.GTK_CALENDAR_SHOW_DAY_NAMES);
} else {
super.createHandle(index);
}