harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apetre...@apache.org
Subject svn commit: r555239 - in /harmony/enhanced/classlib/trunk/modules/awt/src/main: java/common/org/apache/harmony/awt/gl/font/FontManager.java native/fontlib/shared/ParsingTables.cpp
Date Wed, 11 Jul 2007 10:59:18 GMT
Author: apetrenko
Date: Wed Jul 11 03:59:17 2007
New Revision: 555239

URL: http://svn.apache.org/viewvc?view=rev&rev=555239
Log:
The patch for HARMONY-4299 has been reverted

Modified:
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontManager.java
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/ParsingTables.cpp

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontManager.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontManager.java?view=diff&rev=555239&r1=555238&r2=555239
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontManager.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontManager.java
Wed Jul 11 03:59:17 2007
@@ -52,7 +52,7 @@
      */
     public String[] allFamilies;
 
-    public static final String DEFAULT_NAME = IS_FONTLIB ? "Courier" : "Default"; /* Default
font name */ //$NON-NLS-1$
+    public static final String DEFAULT_NAME = IS_FONTLIB ? "Luxi Sans" : "Default"; /* Default
font name */ //$NON-NLS-1$
     public static final String DIALOG_NAME = "Dialog";  /* Dialog font name */ //$NON-NLS-1$
 
     /**

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/ParsingTables.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/ParsingTables.cpp?view=diff&rev=555239&r1=555238&r2=555239
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/ParsingTables.cpp
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/ParsingTables.cpp
Wed Jul 11 03:59:17 2007
@@ -377,21 +377,21 @@
 						}
 						subFamilyName[j] = 0;
 
-//#ifdef WIN32
+/*#ifdef WIN32
 
-#define COMPARE_IT		(!fwcscmp((fwchar_t *)subFamilyName,L"Italic"))
-#define COMPARE_BD		(!fwcscmp((fwchar_t *)subFamilyName,L"Bold"))
-#define COMPARE_BDIT	(!fwcscmp((fwchar_t *)subFamilyName,L"Bold Italic"))
-#define COMPARE_REG		(!fwcscmp((fwchar_t *)subFamilyName,L"Regular") || !fwcscmp((fwchar_t
*)subFamilyName,L"Normal"))
+#define COMPARE_IT		(!_wcsicmp((fwchar_t *)subFamilyName,L"Italic"))
+#define COMPARE_BD		(!_wcsicmp((fwchar_t *)subFamilyName,L"Bold"))
+#define COMPARE_BDIT	(!_wcsicmp((fwchar_t *)subFamilyName,L"Bold Italic"))
+#define COMPARE_REG		(!_wcsicmp((fwchar_t *)subFamilyName,L"Regular") || !_wcsicmp((fwchar_t
*)subFamilyName,L"Normal"))
 
-/*#else
+#else*/
 
 #define COMPARE_IT		(compare((fwchar_t *)subFamilyName, "Italic"))
 #define COMPARE_BD		(compare((fwchar_t *)subFamilyName, "Bold"))
 #define COMPARE_BDIT	(compare((fwchar_t *)subFamilyName, "Bold Italic"))
 #define COMPARE_REG		(compare((fwchar_t *)subFamilyName, "Regular") || compare((fwchar_t
*)subFamilyName, "Normal"))
 
-#endif*/
+//#endif
 
 						if COMPARE_IT
 						{



Mime
View raw message