Author: matt
Date: 2009-09-17 13:00:33 -0700 (Thu, 17 Sep 2009)
New Revision: 6876
Log:
Added the counterpart for FL_COMMAND (F_CONTROL). Added GTK Boxtype to the
Forms test. Made utf function more fail-safe. Testing SCM on Xcode (wish me
luck)
Modified:
branches/branch-1.3/FL/Enumerations.H
branches/branch-1.3/ide/Xcode3.1/FLTK.xcodeproj/project.pbxproj
branches/branch-1.3/src/fl_utf.c
branches/branch-1.3/test/forms.cxx
Modified: branches/branch-1.3/FL/Enumerations.H
===================================================================
--- branches/branch-1.3/FL/Enumerations.H 2009-09-17 01:57:42 UTC (rev
6875)
+++ branches/branch-1.3/FL/Enumerations.H 2009-09-17 20:00:33 UTC (rev
6876)
@@ -408,9 +408,11 @@
#define FL_BUTTON(n) (0x00800000<<(n)) ///< Mouse button n (n > 0) is pushed
#ifdef __APPLE__
-# define FL_COMMAND FL_META ///< An alias for FL_CTRL on WIN32 and
X11, or FL_META on MacOS X
+# define FL_COMMAND FL_META ///< An alias for FL_CTRL on WIN32 and X11,
or FL_META on MacOS X
+# define FL_CONTROL FL_CTRL ///< An alias for FL_META on WIN32 and X11, or
FL_META on MacOS X
#else
# define FL_COMMAND FL_CTRL ///< An alias for FL_CTRL on WIN32 and
X11, or FL_META on MacOS X
+# define FL_CONTROL FL_META ///< An alias for FL_META on WIN32 and X11, or
FL_META on MacOS X
#endif // __APPLE__
/*...@}*/ // group: Event States
Modified: branches/branch-1.3/ide/Xcode3.1/FLTK.xcodeproj/project.pbxproj
===================================================================
--- branches/branch-1.3/ide/Xcode3.1/FLTK.xcodeproj/project.pbxproj
2009-09-17 01:57:42 UTC (rev 6875)
+++ branches/branch-1.3/ide/Xcode3.1/FLTK.xcodeproj/project.pbxproj
2009-09-17 20:00:33 UTC (rev 6876)
@@ -5846,13 +5846,16 @@
/* Begin PBXProject section */
C9A3E93C0DD6332D00486E4F /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ BuildIndependentTargetsInParallel = YES;
+ };
buildConfigurationList = C9A3E93F0DD6332D00486E4F /*
Build configuration list for PBXProject "FLTK" */;
compatibilityVersion = "Xcode 3.0";
hasScannedForEncodings = 0;
mainGroup = C9A3E93A0DD6332D00486E4F;
productRefGroup = C9A3E9520DD6336500486E4F /* Products
*/;
projectDirPath = "";
- projectRoot = "";
+ projectRoot = ../..;
targets = (
C97741FE0DD9D33B0047C1BF /* Demo */,
C9C873730DD7772000A9793F /* Fluid */,
Modified: branches/branch-1.3/src/fl_utf.c
===================================================================
--- branches/branch-1.3/src/fl_utf.c 2009-09-17 01:57:42 UTC (rev 6875)
+++ branches/branch-1.3/src/fl_utf.c 2009-09-17 20:00:33 UTC (rev 6876)
@@ -138,11 +138,11 @@
{
unsigned char c = *(unsigned char*)p;
if (c < 0x80) {
- *len = 1;
+ if (len) *len = 1;
return c;
#if ERRORS_TO_CP1252
} else if (c < 0xa0) {
- *len = 1;
+ if (len) *len = 1;
return cp1252[c-0x80];
#endif
} else if (c < 0xc2) {
@@ -150,7 +150,7 @@
}
if (p+1 >= end || (p[1]&0xc0) != 0x80) goto FAIL;
if (c < 0xe0) {
- *len = 2;
+ if (len) *len = 2;
return
((p[0] & 0x1f) << 6) +
((p[1] & 0x3f));
@@ -171,7 +171,7 @@
} else if (c < 0xf0) {
UTF8_3:
if (p+2 >= end || (p[2]&0xc0) != 0x80) goto FAIL;
- *len = 3;
+ if (len) *len = 3;
return
((p[0] & 0x0f) << 12) +
((p[1] & 0x3f) << 6) +
@@ -182,7 +182,7 @@
} else if (c < 0xf4) {
UTF8_4:
if (p+3 >= end || (p[2]&0xc0) != 0x80 || (p[3]&0xc0) != 0x80) goto FAIL;
- *len = 4;
+ if (len) *len = 4;
#if STRICT_RFC3629
/* RFC 3629 says all codes ending in fffe or ffff are illegal: */
if ((p[1]&0xf)==0xf &&
@@ -199,7 +199,7 @@
goto UTF8_4;
} else {
FAIL:
- *len = 1;
+ if (len) *len = 1;
#if ERRORS_TO_ISO8859_1
return c;
#else
Modified: branches/branch-1.3/test/forms.cxx
===================================================================
--- branches/branch-1.3/test/forms.cxx 2009-09-17 01:57:42 UTC (rev 6875)
+++ branches/branch-1.3/test/forms.cxx 2009-09-17 20:00:33 UTC (rev 6876)
@@ -65,6 +65,8 @@
{FL_OVAL3D_DOWNBOX,"oval3d downbox"},
{FL_PLASTIC_UP_BOX,"plastic upbox"},
{FL_PLASTIC_DOWN_BOX,"plastic downbox"},
+ {FL_GTK_UP_BOX,"GTK up box"},
+ {FL_GTK_ROUND_UP_BOX,"GTK round up box"},
/* sentinel */
{-1}
};
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
