From f3a923d478d6b79c415f44c638b99f891ad5a2dc Mon Sep 17 00:00:00 2001
From: Dick Hollenbeck <dick@softplc.com>
Date: Mon, 4 Apr 2011 09:31:43 -0500
Subject: [PATCH] buglets

---
 new/sch_part.cpp         | 2 +-
 new/sch_sweet_parser.cpp | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/new/sch_part.cpp b/new/sch_part.cpp
index 20469aa846..da66e487e2 100644
--- a/new/sch_part.cpp
+++ b/new/sch_part.cpp
@@ -39,7 +39,7 @@
 static void formatAt( OUTPUTFORMATTER* out, const POINT& aPos, ANGLE aAngle, int indent=0 )
     throw( IO_ERROR )
 {
-    out->Print( indent, aAngle==0.0 ? "(at %.6g %.6g %.6g)" : "(at %.6g %.6g)",
+    out->Print( indent, aAngle!=0.0 ? "(at %.6g %.6g %.6g)" : "(at %.6g %.6g)",
         InternalToLogical( aPos.x ), InternalToLogical( aPos.y ),
         double( aAngle ) );
 }
diff --git a/new/sch_sweet_parser.cpp b/new/sch_sweet_parser.cpp
index 40b2a83d5e..0b18a8dbea 100644
--- a/new/sch_sweet_parser.cpp
+++ b/new/sch_sweet_parser.cpp
@@ -27,7 +27,6 @@
 #include <sch_lib_table.h>
 #include <sch_lpid.h>
 
-#include <macros.h>         // FROM_UTF8()
 
 using namespace SCH;
 using namespace PR;
@@ -1197,7 +1196,7 @@ void SWEET_PARSER::parseText( GR_TEXT* me )
                 Duplicate( tok );
             sawText = true;
 
-            me->text = FROM_UTF8( CurText() );
+            me->text = wxString::FromUTF8( CurText() );
         }
     }
 }