Update of /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/sources/mac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1071/visual_refactor/adobe/test/visual/sources/mac
Modified Files:
metrics.cpp
Log Message:
new xstring implementation; visual building again on Mac
Index: metrics.cpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/sources/mac/metrics.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** metrics.cpp 18 Apr 2005 21:16:05 -0000 1.1
--- metrics.cpp 22 Apr 2005 23:02:32 -0000 1.2
***************
*** 32,36 ****
#if 0
! #pragma mark -
#endif
--- 32,36 ----
#if 0
! #pragma mark -
#endif
***************
*** 47,53 ****
try
{
! const char* cxstr(xstr.c_str());
! std::size_t n(xstr.size());
! std::stringstream expression_stream(std::string(xstr_t(cxstr, n, context).get()));
expression_parser parser(expression_stream, line_position_t("widget_metrics"));
array_t expression;
--- 47,61 ----
try
{
! attribute_set_t widget_context;
!
! widget_context.push_back(std::make_pair(adobe::static_name_t("theme"), adobe::static_name_t("normal")));
!
! adobe::xstring_context_t local_context(widget_context);
!
! std::string resolved_xstr(adobe::xstring(xstr, context));
!
! if (resolved_xstr.empty()) return result;
!
! std::stringstream expression_stream(resolved_xstr);
expression_parser parser(expression_stream, line_position_t("widget_metrics"));
array_t expression;
|
