24869

2 files changed, 0 insertions, 53 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/swt.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/swt.c
index 0a58d21922..bc7017247c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/swt.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/swt.c
@@ -62,8 +62,6 @@
 #define NO_GetClipboardFormatNameA

 #define NO_GetDIBColorTable

 #define NO_GetDIBits

-#define NO_GetFileTitleA

-#define NO_GetFileTitleW

 #define NO_GetFontLanguageInfo

 #define NO_GetIconInfo

 #define NO_GetKeyboardLayout

@@ -2154,44 +2152,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetDoubleClickTime)
 }

 #endif /* NO_GetDoubleClickTime */

 

-#ifndef NO_GetFileTitleA

-JNIEXPORT jshort JNICALL OS_NATIVE(GetFileTitleA)

-	(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jshort arg2)

-{

-	jbyte *lparg0=NULL;

-	jbyte *lparg1=NULL;

-	jshort rc;

-

-	DEBUG_CALL("GetFileTitleA\n")

-

-	if (arg0) lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL);

-	if (arg1) lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL);

-	rc = (jshort)GetFileTitleA((LPSTR)lparg0, (LPSTR)lparg1, arg2);

-	if (arg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);

-	if (arg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);

-	return rc;

-}

-#endif /* NO_GetFileTitleA */

-

-#ifndef NO_GetFileTitleW

-JNIEXPORT jshort JNICALL OS_NATIVE(GetFileTitleW)

-	(JNIEnv *env, jclass that, jcharArray arg0, jcharArray arg1, jshort arg2)

-{

-	jchar *lparg0=NULL;

-	jchar *lparg1=NULL;

-	jshort rc;

-

-	DEBUG_CALL("GetFileTitleW\n")

-

-	if (arg0) lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL);

-	if (arg1) lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL);

-	rc = (jshort)GetFileTitleW((LPWSTR)lparg0, (LPWSTR)lparg1, arg2);

-	if (arg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);

-	if (arg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);

-	return rc;

-}

-#endif /* NO_GetFileTitleW */

-

 #ifndef NO_GetFocus

 JNIEXPORT jint JNICALL OS_NATIVE(GetFocus)

 	(JNIEnv *env, jclass that)

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
index 11102f0dae..595644fe42 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
@@ -1415,17 +1415,6 @@ public static final int GetKeyNameText (int lParam, TCHAR lpString, int nSize) {
 	return GetKeyNameTextA (lParam, lpString1, nSize);

 }

 

-public static final short GetFileTitle (TCHAR lpszFile, TCHAR lpszTitle, short cbBuf) {

-	if (IsUnicode) {

-		char [] lpszFile1 = lpszFile == null ? null : lpszFile.chars;

-		char [] lpszTitle1 = lpszTitle == null ? null : lpszTitle.chars;

-		return GetFileTitleW (lpszFile1, lpszTitle1, cbBuf);

-	}

-	byte [] lpszFile1 = lpszFile == null ? null : lpszFile.bytes;

-	byte [] lpszTitle1 = lpszTitle == null ? null : lpszTitle.bytes;

-	return GetFileTitleA (lpszFile1, lpszTitle1, cbBuf);

-}

-

 public static final int GetLocaleInfo (int Locale, int LCType, TCHAR lpLCData, int cchData) {

 	if (IsUnicode) {

 		char [] lpLCData1 = lpLCData == null ? null : lpLCData.chars;

@@ -2066,8 +2055,6 @@ public static final native int GetDIBColorTable (int hdc, int uStartIndex, int c
 public static final native int GetDIBits (int hdc, int hbmp, int uStartScan, int cScanLines, int lpvBits, byte[] lpbi, int uUsage);

 public static final native int GetDlgItem (int hDlg, int nIDDlgItem);

 public static final native int GetDoubleClickTime ();

-public static final native short GetFileTitleW (char [] lpszFile, char [] lpszTitle, short cbBuf);

-public static final native short GetFileTitleA (byte [] lpszFile, byte [] lpszTitle, short cbBuf);

 public static final native int GetFocus ();

 public static final native int GetFontLanguageInfo(int hdc);

 public static final native boolean GetIconInfo (int hIcon, ICONINFO piconinfo);