Elliptic arc fix for getting bounds

[wxWidgets.git] / contrib / src / ogl / drawn.cpp

diff --git a/contrib/src/ogl/drawn.cpp b/contrib/src/ogl/drawn.cpp
index 3104fbaf104c06facb73961d395e0daf06e5f978..72130a6759c685f410c853775a4b9d3425bf8079 100644 (file)
--- a/contrib/src/ogl/drawn.cpp
+++ b/contrib/src/ogl/drawn.cpp
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -25,21 +25,15 @@
 #include <wx/wx.h>
 #endif
 
 #include <wx/wx.h>
 #endif
 

+#if wxUSE_PROLOGIO

 #include <wx/deprecated/wxexpr.h>
 #include <wx/deprecated/wxexpr.h>

+#endif

 
 

-#include <wx/ogl/basic.h>
-#include <wx/ogl/basicp.h>
-#include <wx/ogl/canvas.h>
-#include <wx/ogl/mfutils.h>
-#include <wx/ogl/drawn.h>
-#include <wx/ogl/drawnp.h>
-#include <wx/ogl/misc.h>
-
-#include <math.h>
+#include "wx/ogl/ogl.h"

 
 

-static void IntToHex(unsigned int dec, char *buf);
-static unsigned long HexToInt(char *buf);
-extern char *oglBuffer;
+static void IntToHex(unsigned int dec, wxChar *buf);
+static unsigned long HexToInt(wxChar *buf);
+extern wxChar *oglBuffer;

 
 #define gyTYPE_PEN   40
 #define gyTYPE_BRUSH 41
 
 #define gyTYPE_PEN   40
 #define gyTYPE_BRUSH 41


@@ -54,7 +48,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxDrawnShape, wxRectangleShape)
 
 wxDrawnShape::wxDrawnShape():wxRectangleShape(100.0, 50.0)
 {
 
 wxDrawnShape::wxDrawnShape():wxRectangleShape(100.0, 50.0)
 {

-  m_saveToFile = TRUE;
+  m_saveToFile = true;

   m_currentAngle = oglDRAWN_ANGLE_0;
 }
 
   m_currentAngle = oglDRAWN_ANGLE_0;
 }
 


@@ -79,7 +73,7 @@ void wxDrawnShape::OnDraw(wxDC& dc)
   m_metafiles[m_currentAngle].Draw(dc, m_xpos, m_ypos);
 }
 
   m_metafiles[m_currentAngle].Draw(dc, m_xpos, m_ypos);
 }
 

-void wxDrawnShape::SetSize(double w, double h, bool recursive)
+void wxDrawnShape::SetSize(double w, double h, bool WXUNUSED(recursive))

 {
   SetAttachmentSize(w, h);
 
 {
   SetAttachmentSize(w, h);
 


@@ -92,8 +86,7 @@ void wxDrawnShape::SetSize(double w, double h, bool recursive)
     scaleY = 1.0;
   else scaleY = h/GetHeight();
 
     scaleY = 1.0;
   else scaleY = h/GetHeight();
 

-  int i = 0;
-  for (i = 0; i < 4; i++)
+  for (int i = 0; i < 4; i++)

   {
     if (m_metafiles[i].IsValid())
         m_metafiles[i].Scale(scaleX, scaleY);
   {
     if (m_metafiles[i].IsValid())
         m_metafiles[i].Scale(scaleX, scaleY);


@@ -169,7 +162,7 @@ void wxDrawnShape::Rotate(double x, double y, double theta)
 int wxDrawnShape::DetermineMetaFile(double rotation)
 {
     double tolerance = 0.0001;
 int wxDrawnShape::DetermineMetaFile(double rotation)
 {
     double tolerance = 0.0001;

-    const double pi = 3.1415926535897932384626433832795 ;
+    const double pi = M_PI ;

     double angle1 = 0.0;
     double angle2 = pi/2.0;
     double angle3 = pi;
     double angle1 = 0.0;
     double angle2 = pi/2.0;
     double angle3 = pi;


@@ -229,7 +222,7 @@ bool wxDrawnShape::GetPerimeterPoint(double x1, double y1,
         wxDrawOp* op = (wxDrawOp*) node->GetData();
 
         if (op->GetPerimeterPoint(x1, y1, x2, y2, x3, y3, GetX(), GetY(), GetAttachmentMode()))
         wxDrawOp* op = (wxDrawOp*) node->GetData();
 
         if (op->GetPerimeterPoint(x1, y1, x2, y2, x3, y3, GetX(), GetY(), GetAttachmentMode()))

-            return TRUE;
+            return true;

     }
 
     // Default... just use a rectangle
     }
 
     // Default... just use a rectangle


@@ -241,12 +234,11 @@ void wxDrawnShape::WriteAttributes(wxExpr *clause)
 {
   wxRectangleShape::WriteAttributes(clause);
 
 {
   wxRectangleShape::WriteAttributes(clause);
 

-  clause->AddAttributeValue("current_angle", (long)m_currentAngle);
-  clause->AddAttributeValue("save_metafile", (long)m_saveToFile);
+  clause->AddAttributeValue(_T("current_angle"), (long)m_currentAngle);
+  clause->AddAttributeValue(_T("save_metafile"), (long)m_saveToFile);

   if (m_saveToFile)
   {
   if (m_saveToFile)
   {

-    int i = 0;
-    for (i = 0; i < 4; i++)
+    for (int i = 0; i < 4; i++)

     {
         if (m_metafiles[i].IsValid())
             m_metafiles[i].WriteAttributes(clause, i);
     {
         if (m_metafiles[i].IsValid())
             m_metafiles[i].WriteAttributes(clause, i);


@@ -259,14 +251,13 @@ void wxDrawnShape::ReadAttributes(wxExpr *clause)
   wxRectangleShape::ReadAttributes(clause);
 
   int iVal = (int) m_saveToFile;
   wxRectangleShape::ReadAttributes(clause);
 
   int iVal = (int) m_saveToFile;

-  clause->GetAttributeValue("save_metafile", iVal);
-  clause->GetAttributeValue("current_angle", m_currentAngle);
+  clause->GetAttributeValue(_T("save_metafile"), iVal);
+  clause->GetAttributeValue(_T("current_angle"), m_currentAngle);

   m_saveToFile = (iVal != 0);
 
   if (m_saveToFile)
   {
   m_saveToFile = (iVal != 0);
 
   if (m_saveToFile)
   {

-    int i = 0;
-    for (i = 0; i < 4; i++)
+    for (int i = 0; i < 4; i++)

     {
       m_metafiles[i].ReadAttributes(clause, i);
     }
     {
       m_metafiles[i].ReadAttributes(clause, i);
     }


@@ -283,8 +274,7 @@ void wxDrawnShape::Copy(wxShape& copy)
 
   wxDrawnShape& drawnCopy = (wxDrawnShape&) copy;
 
 
   wxDrawnShape& drawnCopy = (wxDrawnShape&) copy;
 

-  int i = 0;
-  for (i = 0; i < 4; i++)
+  for (int i = 0; i < 4; i++)

   {
     m_metafiles[i].Copy(drawnCopy.m_metafiles[i]);
   }
   {
     m_metafiles[i].Copy(drawnCopy.m_metafiles[i]);
   }


@@ -422,7 +412,7 @@ wxOpSetGDI::wxOpSetGDI(int theOp, wxPseudoMetaFile *theImage, int theGdiIndex, i
   m_mode = theMode;
 }
 
   m_mode = theMode;
 }
 

-void wxOpSetGDI::Do(wxDC& dc, double xoffset, double yoffset)
+void wxOpSetGDI::Do(wxDC& dc, double WXUNUSED(xoffset), double WXUNUSED(yoffset))

 {
   switch (m_op)
   {
 {
   switch (m_op)
   {


@@ -523,7 +513,7 @@ wxDrawOp *wxOpSetGDI::Copy(wxPseudoMetaFile *newImage)
 }
 
 #if wxUSE_PROLOGIO
 }
 
 #if wxUSE_PROLOGIO

-wxExpr *wxOpSetGDI::WriteExpr(wxPseudoMetaFile *image)
+wxExpr *wxOpSetGDI::WriteExpr(wxPseudoMetaFile *WXUNUSED(image))

 {
   wxExpr *expr = new wxExpr(wxExprList);
   expr->Append(new wxExpr((long)m_op));
 {
   wxExpr *expr = new wxExpr(wxExprList);
   expr->Append(new wxExpr((long)m_op));


@@ -555,7 +545,7 @@ wxExpr *wxOpSetGDI::WriteExpr(wxPseudoMetaFile *image)
   return expr;
 }
 
   return expr;
 }
 

-void wxOpSetGDI::ReadExpr(wxPseudoMetaFile *image, wxExpr *expr)
+void wxOpSetGDI::ReadExpr(wxPseudoMetaFile *WXUNUSED(image), wxExpr *expr)

 {
   switch (m_op)
   {
 {
   switch (m_op)
   {


@@ -599,7 +589,7 @@ wxOpSetClipping::wxOpSetClipping(int theOp, double theX1, double theY1,
   m_y2 = theY2;
 }
 
   m_y2 = theY2;
 }
 

-wxDrawOp *wxOpSetClipping::Copy(wxPseudoMetaFile *newImage)
+wxDrawOp *wxOpSetClipping::Copy(wxPseudoMetaFile *WXUNUSED(newImage))

 {
   wxOpSetClipping *newOp = new wxOpSetClipping(m_op, m_x1, m_y1, m_x2, m_y2);
   return newOp;
 {
   wxOpSetClipping *newOp = new wxOpSetClipping(m_op, m_x1, m_y1, m_x2, m_y2);
   return newOp;


@@ -639,7 +629,7 @@ void wxOpSetClipping::Translate(double x, double y)
 }
 
 #if wxUSE_PROLOGIO
 }
 
 #if wxUSE_PROLOGIO

-wxExpr *wxOpSetClipping::WriteExpr(wxPseudoMetaFile *image)
+wxExpr *wxOpSetClipping::WriteExpr(wxPseudoMetaFile *WXUNUSED(image))

 {
   wxExpr *expr = new wxExpr(wxExprList);
   expr->Append(new wxExpr((long)m_op));
 {
   wxExpr *expr = new wxExpr(wxExprList);
   expr->Append(new wxExpr((long)m_op));


@@ -659,7 +649,7 @@ wxExpr *wxOpSetClipping::WriteExpr(wxPseudoMetaFile *image)
   return expr;
 }
 
   return expr;
 }
 

-void wxOpSetClipping::ReadExpr(wxPseudoMetaFile *image, wxExpr *expr)
+void wxOpSetClipping::ReadExpr(wxPseudoMetaFile *WXUNUSED(image), wxExpr *expr)

 {
   switch (m_op)
   {
 {
   switch (m_op)
   {


@@ -683,7 +673,7 @@ void wxOpSetClipping::ReadExpr(wxPseudoMetaFile *image, wxExpr *expr)
  */
 
 wxOpDraw::wxOpDraw(int theOp, double theX1, double theY1, double theX2, double theY2,
  */
 
 wxOpDraw::wxOpDraw(int theOp, double theX1, double theY1, double theX2, double theY2,

-         double theRadius, wxChar *s) : wxDrawOp(theOp)
+         double theRadius, const wxString& s) : wxDrawOp(theOp)

 {
   m_x1 = theX1;
   m_y1 = theY1;
 {
   m_x1 = theX1;
   m_y1 = theY1;


@@ -692,16 +682,14 @@ wxOpDraw::wxOpDraw(int theOp, double theX1, double theY1, double theX2, double t
   m_x3 = 0.0;
   m_y3 = 0.0;
   m_radius = theRadius;
   m_x3 = 0.0;
   m_y3 = 0.0;
   m_radius = theRadius;

-  if (s) m_textString = copystring(s);
-  else m_textString = NULL;
+  m_textString = s;

 }
 
 wxOpDraw::~wxOpDraw()
 {
 }
 
 wxOpDraw::~wxOpDraw()
 {

-  if (m_textString) delete[] m_textString;

 }
 
 }
 

-wxDrawOp *wxOpDraw::Copy(wxPseudoMetaFile *newImage)
+wxDrawOp *wxOpDraw::Copy(wxPseudoMetaFile *WXUNUSED(newImage))

 {
   wxOpDraw *newOp = new wxOpDraw(m_op, m_x1, m_y1, m_x2, m_y2, m_radius, m_textString);
   newOp->m_x3 = m_x3;
 {
   wxOpDraw *newOp = new wxOpDraw(m_op, m_x1, m_y1, m_x2, m_y2, m_radius, m_textString);
   newOp->m_x3 = m_x3;


@@ -742,7 +730,7 @@ void wxOpDraw::Do(wxDC& dc, double xoffset, double yoffset)
     }
     case DRAWOP_DRAW_ELLIPTIC_ARC:
     {
     }
     case DRAWOP_DRAW_ELLIPTIC_ARC:
     {

-      const double pi = 3.1415926535897932384626433832795 ;
+      const double pi = M_PI ;

 
       // Convert back to degrees
       dc.DrawEllipticArc(
 
       // Convert back to degrees
       dc.DrawEllipticArc(


@@ -824,10 +812,10 @@ void wxOpDraw::Rotate(double x, double y, double theta, double sinTheta, double
       double newX2 = m_x2*cosTheta - m_y2*sinTheta + x*(1.0 - cosTheta) + y*sinTheta;
       double newY2 = m_x2*sinTheta + m_y2*cosTheta + y*(1.0 - cosTheta) + x*sinTheta;
 
       double newX2 = m_x2*cosTheta - m_y2*sinTheta + x*(1.0 - cosTheta) + y*sinTheta;
       double newY2 = m_x2*sinTheta + m_y2*cosTheta + y*(1.0 - cosTheta) + x*sinTheta;
 

-         m_x1 = newX1;
-         m_y1 = newY1;
-         m_x2 = newX2;
-         m_y2 = newY2;
+      m_x1 = newX1;
+      m_y1 = newY1;
+      m_x2 = newX2;
+      m_y2 = newY2;

       break;
     }
     case DRAWOP_DRAW_RECT:
       break;
     }
     case DRAWOP_DRAW_RECT:


@@ -870,12 +858,12 @@ void wxOpDraw::Rotate(double x, double y, double theta, double sinTheta, double
       double newX3 = m_x3*cosTheta - m_y3*sinTheta + x*(1.0 - cosTheta) + y*sinTheta;
       double newY3 = m_x3*sinTheta + m_y3*cosTheta + y*(1.0 - cosTheta) + x*sinTheta;
 
       double newX3 = m_x3*cosTheta - m_y3*sinTheta + x*(1.0 - cosTheta) + y*sinTheta;
       double newY3 = m_x3*sinTheta + m_y3*cosTheta + y*(1.0 - cosTheta) + x*sinTheta;
 

-         m_x1 = newX1;
-         m_y1 = newY1;
-         m_x2 = newX2;
-         m_y2 = newY2;
-         m_x3 = newX3;
-         m_y3 = newY3;
+      m_x1 = newX1;
+      m_y1 = newY1;
+      m_x2 = newX2;
+      m_y2 = newY2;
+      m_x3 = newX3;
+      m_y3 = newY3;

 
       break;
     }
 
       break;
     }


@@ -885,7 +873,7 @@ void wxOpDraw::Rotate(double x, double y, double theta, double sinTheta, double
 }
 
 #if wxUSE_PROLOGIO
 }
 
 #if wxUSE_PROLOGIO

-wxExpr *wxOpDraw::WriteExpr(wxPseudoMetaFile *image)
+wxExpr *wxOpDraw::WriteExpr(wxPseudoMetaFile *WXUNUSED(image))

 {
   wxExpr *expr = new wxExpr(wxExprList);
   expr->Append(new wxExpr((long)m_op));
 {
   wxExpr *expr = new wxExpr(wxExprList);
   expr->Append(new wxExpr((long)m_op));


@@ -942,7 +930,7 @@ wxExpr *wxOpDraw::WriteExpr(wxPseudoMetaFile *image)
   return expr;
 }
 
   return expr;
 }
 

-void wxOpDraw::ReadExpr(wxPseudoMetaFile *image, wxExpr *expr)
+void wxOpDraw::ReadExpr(wxPseudoMetaFile *WXUNUSED(image), wxExpr *expr)

 {
   switch (m_op)
   {
 {
   switch (m_op)
   {


@@ -975,8 +963,7 @@ void wxOpDraw::ReadExpr(wxPseudoMetaFile *image, wxExpr *expr)
     {
       m_x1 = expr->Nth(1)->RealValue();
       m_y1 = expr->Nth(2)->RealValue();
     {
       m_x1 = expr->Nth(1)->RealValue();
       m_y1 = expr->Nth(2)->RealValue();

-      wxString str(expr->Nth(3)->StringValue());
-      m_textString = copystring(str);
+      m_textString = wxString(expr->Nth(3)->StringValue());

       break;
     }
     case DRAWOP_DRAW_ARC:
       break;
     }
     case DRAWOP_DRAW_ARC:


@@ -1014,7 +1001,7 @@ wxOpPolyDraw::~wxOpPolyDraw()
   delete[] m_points;
 }
 
   delete[] m_points;
 }
 

-wxDrawOp *wxOpPolyDraw::Copy(wxPseudoMetaFile *newImage)
+wxDrawOp *wxOpPolyDraw::Copy(wxPseudoMetaFile *WXUNUSED(newImage))

 {
   wxRealPoint *newPoints = new wxRealPoint[m_noPoints];
   for (int i = 0; i < m_noPoints; i++)
 {
   wxRealPoint *newPoints = new wxRealPoint[m_noPoints];
   for (int i = 0; i < m_noPoints; i++)


@@ -1074,7 +1061,6 @@ void wxOpPolyDraw::Do(wxDC& dc, double xoffset, double yoffset)
 
         delete[] actualPoints;
         break;
 
         delete[] actualPoints;
         break;

-      break;

     }
     default:
       break;
     }
     default:
       break;


@@ -1099,7 +1085,7 @@ void wxOpPolyDraw::Translate(double x, double y)
   }
 }
 
   }
 }
 

-void wxOpPolyDraw::Rotate(double x, double y, double theta, double sinTheta, double cosTheta)
+void wxOpPolyDraw::Rotate(double x, double y, double WXUNUSED(theta), double sinTheta, double cosTheta)

 {
   for (int i = 0; i < m_noPoints; i++)
   {
 {
   for (int i = 0; i < m_noPoints; i++)
   {


@@ -1111,15 +1097,15 @@ void wxOpPolyDraw::Rotate(double x, double y, double theta, double sinTheta, dou
 }
 
 #if wxUSE_PROLOGIO
 }
 
 #if wxUSE_PROLOGIO

-wxExpr *wxOpPolyDraw::WriteExpr(wxPseudoMetaFile *image)
+wxExpr *wxOpPolyDraw::WriteExpr(wxPseudoMetaFile *WXUNUSED(image))

 {
   wxExpr *expr = new wxExpr(wxExprList);
   expr->Append(new wxExpr((long)m_op));
   expr->Append(new wxExpr((long)m_noPoints));
 
 //  char buf1[9];
 {
   wxExpr *expr = new wxExpr(wxExprList);
   expr->Append(new wxExpr((long)m_op));
   expr->Append(new wxExpr((long)m_noPoints));
 
 //  char buf1[9];

-  char buf2[5];
-  char buf3[5];
+  wxChar buf2[5];
+  wxChar buf3[5];

 
   oglBuffer[0] = 0;
 
 
   oglBuffer[0] = 0;
 


@@ -1146,20 +1132,20 @@ wxExpr *wxOpPolyDraw::WriteExpr(wxPseudoMetaFile *image)
     // Don't overrun the buffer
     if ((i*8) < 3000)
     {
     // Don't overrun the buffer
     if ((i*8) < 3000)
     {

-      strcat(oglBuffer, buf2);
-      strcat(oglBuffer, buf3);
+      wxStrcat(oglBuffer, buf2);
+      wxStrcat(oglBuffer, buf3);

     }
   }
   expr->Append(new wxExpr(wxExprString, oglBuffer));
   return expr;
 }
 
     }
   }
   expr->Append(new wxExpr(wxExprString, oglBuffer));
   return expr;
 }
 

-void wxOpPolyDraw::ReadExpr(wxPseudoMetaFile *image, wxExpr *expr)
+void wxOpPolyDraw::ReadExpr(wxPseudoMetaFile *WXUNUSED(image), wxExpr *expr)

 {
   m_noPoints = (int)expr->Nth(1)->IntegerValue();
 
 {
   m_noPoints = (int)expr->Nth(1)->IntegerValue();
 

-  char buf1[5];
-  char buf2[5];
+  wxChar buf1[5];
+  wxChar buf2[5];

 
   m_points = new wxRealPoint[m_noPoints];
   int i = 0;
 
   m_points = new wxRealPoint[m_noPoints];
   int i = 0;


@@ -1188,7 +1174,7 @@ void wxOpPolyDraw::ReadExpr(wxPseudoMetaFile *image, wxExpr *expr)
     // Scale -32K -> +32K
     long signedX = unSignedX - 32767;
     long signedY = unSignedY - 32767;
     // Scale -32K -> +32K
     long signedX = unSignedX - 32767;
     long signedY = unSignedY - 32767;

-#ifdef __WXMSW__
+#if defined(__WXMSW__) && 0

     int testX = (signed int)unSignedX;
     int testY = (signed int)unSignedY;
 #endif
     int testX = (signed int)unSignedX;
     int testY = (signed int)unSignedY;
 #endif


@@ -1220,7 +1206,7 @@ bool wxOpPolyDraw::OnDrawOutline(wxDC& dc, double x, double y, double w, double
     }
     dc.DrawPolygon(n, intPoints, (long) x, (long) y);
     delete[] intPoints;
     }
     dc.DrawPolygon(n, intPoints, (long) x, (long) y);
     delete[] intPoints;

-    return TRUE;
+    return true;

 }
 
 // Assume (x1, y1) is centre of box (most generally, line end at box)
 }
 
 // Assume (x1, y1) is centre of box (most generally, line end at box)


@@ -1250,13 +1236,13 @@ bool wxOpPolyDraw::GetPerimeterPoint(double x1, double y1,
         {
           *x3 = point->x + xOffset;
           *y3 = point->y + yOffset;
         {
           *x3 = point->x + xOffset;
           *y3 = point->y + yOffset;

-          return TRUE;
+          return true;

         }
         else if ((y2 < y1) && (point->y < 0.0))
         {
           *x3 = point->x + xOffset;
           *y3 = point->y + yOffset;
         }
         else if ((y2 < y1) && (point->y < 0.0))
         {
           *x3 = point->x + xOffset;
           *y3 = point->y + yOffset;

-          return TRUE;
+          return true;

         }
       }
     }
         }
       }
     }


@@ -1265,8 +1251,7 @@ bool wxOpPolyDraw::GetPerimeterPoint(double x1, double y1,
   double *xpoints = new double[n];
   double *ypoints = new double[n];
 
   double *xpoints = new double[n];
   double *ypoints = new double[n];
 

-  int i = 0;
-  for (i = 0; i < n; i++)
+  for (int i = 0; i < n; i++)

   {
     wxRealPoint *point = & (m_points[i]);
     xpoints[i] = point->x + xOffset;
   {
     wxRealPoint *point = & (m_points[i]);
     xpoints[i] = point->x + xOffset;


@@ -1279,7 +1264,7 @@ bool wxOpPolyDraw::GetPerimeterPoint(double x1, double y1,
   delete[] xpoints;
   delete[] ypoints;
 
   delete[] xpoints;
   delete[] ypoints;
 

-  return TRUE;
+  return true;

 }
 
 
 }
 
 


@@ -1288,11 +1273,12 @@ bool wxOpPolyDraw::GetPerimeterPoint(double x1, double y1,
  *
  */
 
  *
  */
 

-static char hexArray[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B',
-  'C', 'D', 'E', 'F' };
+static char hexArray[] = {
+    _T('0'), _T('1'), _T('2'), _T('3'), _T('4'), _T('5'), _T('6'), _T('7'),
+    _T('8'), _T('9'), _T('A'), _T('B'), _T('C'), _T('D'), _T('E'), _T('F') };

 
 // Convert unsigned 16-bit integer to 4-character hex string
 
 // Convert unsigned 16-bit integer to 4-character hex string

-static void IntToHex(unsigned int dec, char *buf)
+static void IntToHex(unsigned int dec, wxChar *buf)

 {
   int digit1 = (int)(dec/4096);
   int digit2 = (int)((dec - (digit1*4096))/256);
 {
   int digit1 = (int)(dec/4096);
   int digit2 = (int)((dec - (digit1*4096))/256);


@@ -1307,50 +1293,49 @@ static void IntToHex(unsigned int dec, char *buf)
 }
 
 // One hex digit to decimal number
 }
 
 // One hex digit to decimal number

-static int HexToInt1(char hex)
+static int HexToInt1(wxChar hex)

 {
   switch (hex)
   {
 {
   switch (hex)
   {

-    case '0':
+    case _T('0'):

       return 0;
       return 0;

-    case '1':
+    case _T('1'):

       return 1;
       return 1;

-    case '2':
+    case _T('2'):

       return 2;
       return 2;

-    case '3':
+    case _T('3'):

       return 3;
       return 3;

-    case '4':
+    case _T('4'):

       return 4;
       return 4;

-    case '5':
+    case _T('5'):

       return 5;
       return 5;

-    case '6':
+    case _T('6'):

       return 6;
       return 6;

-    case '7':
+    case _T('7'):

       return 7;
       return 7;

-    case '8':
+    case _T('8'):

       return 8;
       return 8;

-    case '9':
+    case _T('9'):

       return 9;
       return 9;

-    case 'A':
+    case _T('A'):

       return 10;
       return 10;

-    case 'B':
+    case _T('B'):

       return 11;
       return 11;

-    case 'C':
+    case _T('C'):

       return 12;
       return 12;

-    case 'D':
+    case _T('D'):

       return 13;
       return 13;

-    case 'E':
+    case _T('E'):

       return 14;
       return 14;

-    case 'F':
+    case _T('F'):

       return 15;
       return 15;

-    default:
-      return 0;

   }
   }

+

   return 0;
 }
 
 // 4-digit hex string to unsigned integer
   return 0;
 }
 
 // 4-digit hex string to unsigned integer

-static unsigned long HexToInt(char *buf)
+static unsigned long HexToInt(wxChar *buf)

 {
   long d1 = (long)(HexToInt1(buf[0])*4096.0) ;
   long d2 = (long)(HexToInt1(buf[1])*256.0) ;
 {
   long d1 = (long)(HexToInt1(buf[0])*4096.0) ;
   long d2 = (long)(HexToInt1(buf[1])*256.0) ;


@@ -1370,7 +1355,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPseudoMetaFile, wxObject)
 wxPseudoMetaFile::wxPseudoMetaFile()
 {
   m_currentRotation = 0;
 wxPseudoMetaFile::wxPseudoMetaFile()
 {
   m_currentRotation = 0;

-  m_rotateable = TRUE;
+  m_rotateable = true;

   m_width = 0.0;
   m_height = 0.0;
   m_outlinePen = NULL;
   m_width = 0.0;
   m_height = 0.0;
   m_outlinePen = NULL;


@@ -1378,7 +1363,7 @@ wxPseudoMetaFile::wxPseudoMetaFile()
   m_outlineOp = -1;
 }
 
   m_outlineOp = -1;
 }
 

-wxPseudoMetaFile::wxPseudoMetaFile(wxPseudoMetaFile& mf)
+wxPseudoMetaFile::wxPseudoMetaFile(wxPseudoMetaFile& mf):wxObject()

 {
   mf.Copy(*this);
 }
 {
   mf.Copy(*this);
 }


@@ -1478,12 +1463,12 @@ void wxPseudoMetaFile::WriteAttributes(wxExpr *clause, int whichAngle)
   clause->AddAttributeValue(outlineStr, (long)m_outlineOp);
 
   // Write GDI objects
   clause->AddAttributeValue(outlineStr, (long)m_outlineOp);
 
   // Write GDI objects

-  char buf[50];
+  wxChar buf[50];

   int i = 1;
   wxNode *node = m_gdiObjects.GetFirst();
   while (node)
   {
   int i = 1;
   wxNode *node = m_gdiObjects.GetFirst();
   while (node)
   {

-    sprintf(buf, "gdi%d_%d", whichAngle, i);
+    wxSprintf(buf, _T("gdi%d_%d"), whichAngle, i);

     wxObject *obj = (wxObject *)node->GetData();
     wxExpr *expr = NULL;
     if (obj)
     wxObject *obj = (wxObject *)node->GetData();
     wxExpr *expr = NULL;
     if (obj)


@@ -1541,7 +1526,7 @@ void wxPseudoMetaFile::WriteAttributes(wxExpr *clause, int whichAngle)
   node = m_ops.GetFirst();
   while (node)
   {
   node = m_ops.GetFirst();
   while (node)
   {

-    sprintf(buf, "op%d_%d", whichAngle, i);
+    wxSprintf(buf, _T("op%d_%d"), whichAngle, i);

     wxDrawOp *op = (wxDrawOp *)node->GetData();
     wxExpr *expr = op->WriteExpr(this);
     if (expr)
     wxDrawOp *op = (wxDrawOp *)node->GetData();
     wxExpr *expr = op->WriteExpr(this);
     if (expr)


@@ -1607,17 +1592,17 @@ void wxPseudoMetaFile::ReadAttributes(wxExpr *clause, int whichAngle)
   m_rotateable = (iVal != 0);
 
   // Read GDI objects
   m_rotateable = (iVal != 0);
 
   // Read GDI objects

-  char buf[50];
+  wxChar buf[50];

   int i = 1;
   int i = 1;

-  bool keepGoing = TRUE;
+  bool keepGoing = true;

   while (keepGoing)
   {
   while (keepGoing)
   {

-    sprintf(buf, "gdi%d_%d", whichAngle, i);
+    wxSprintf(buf, _T("gdi%d_%d"), whichAngle, i);

     wxExpr *expr = NULL;
     clause->GetAttributeValue(buf, &expr);
     if (!expr)
     {
     wxExpr *expr = NULL;
     clause->GetAttributeValue(buf, &expr);
     if (!expr)
     {

-      keepGoing = FALSE;
+      keepGoing = false;

     }
     else
     {
     }
     else
     {


@@ -1628,9 +1613,9 @@ void wxPseudoMetaFile::ReadAttributes(wxExpr *clause, int whichAngle)
         {
           int penWidth = (int)expr->Nth(1)->IntegerValue();
           int penStyle = (int)expr->Nth(2)->IntegerValue();
         {
           int penWidth = (int)expr->Nth(1)->IntegerValue();
           int penStyle = (int)expr->Nth(2)->IntegerValue();

-          int penRed = (int)expr->Nth(3)->IntegerValue();
-          int penGreen = (int)expr->Nth(4)->IntegerValue();
-          int penBlue = (int)expr->Nth(5)->IntegerValue();
+          unsigned char penRed = (unsigned char)expr->Nth(3)->IntegerValue();
+          unsigned char penGreen = (unsigned char)expr->Nth(4)->IntegerValue();
+          unsigned char penBlue = (unsigned char)expr->Nth(5)->IntegerValue();

           wxColour col(penRed, penGreen, penBlue);
           wxPen *p = wxThePenList->FindOrCreatePen(col, penWidth, penStyle);
           if (!p)
           wxColour col(penRed, penGreen, penBlue);
           wxPen *p = wxThePenList->FindOrCreatePen(col, penWidth, penStyle);
           if (!p)


@@ -1641,9 +1626,9 @@ void wxPseudoMetaFile::ReadAttributes(wxExpr *clause, int whichAngle)
         case gyTYPE_BRUSH:
         {
           int brushStyle = (int)expr->Nth(1)->IntegerValue();
         case gyTYPE_BRUSH:
         {
           int brushStyle = (int)expr->Nth(1)->IntegerValue();

-          int brushRed = (int)expr->Nth(2)->IntegerValue();
-          int brushGreen = (int)expr->Nth(3)->IntegerValue();
-          int brushBlue = (int)expr->Nth(4)->IntegerValue();
+          unsigned char brushRed = (unsigned char)expr->Nth(2)->IntegerValue();
+          unsigned char brushGreen = (unsigned char)expr->Nth(3)->IntegerValue();
+          unsigned char brushBlue = (unsigned char)expr->Nth(4)->IntegerValue();

           wxColour col(brushRed, brushGreen, brushBlue);
           wxBrush *b = wxTheBrushList->FindOrCreateBrush(col, brushStyle);
           if (!b)
           wxColour col(brushRed, brushGreen, brushBlue);
           wxBrush *b = wxTheBrushList->FindOrCreateBrush(col, brushStyle);
           if (!b)


@@ -1674,16 +1659,16 @@ void wxPseudoMetaFile::ReadAttributes(wxExpr *clause, int whichAngle)
   }
 
   // Now read in the operations
   }
 
   // Now read in the operations

-  keepGoing = TRUE;
+  keepGoing = true;

   i = 1;
   while (keepGoing)
   {
   i = 1;
   while (keepGoing)
   {

-    sprintf(buf, "op%d_%d", whichAngle, i);
+    wxSprintf(buf, _T("op%d_%d"), whichAngle, i);

     wxExpr *expr = NULL;
     clause->GetAttributeValue(buf, &expr);
     if (!expr)
     {
     wxExpr *expr = NULL;
     clause->GetAttributeValue(buf, &expr);
     if (!expr)
     {

-      keepGoing = FALSE;
+      keepGoing = false;

     }
     else
     {
     }
     else
     {


@@ -1828,14 +1813,14 @@ void wxPseudoMetaFile::Copy(wxPseudoMetaFile& copy)
 bool wxPseudoMetaFile::LoadFromMetaFile(const wxString& filename, double *rwidth, double *rheight)
 {
   if (!wxFileExists(filename))
 bool wxPseudoMetaFile::LoadFromMetaFile(const wxString& filename, double *rwidth, double *rheight)
 {
   if (!wxFileExists(filename))

-    return FALSE;
+    return false;

 
   wxXMetaFile *metaFile = new wxXMetaFile;
 
   if (!metaFile->ReadFile(filename))
   {
     delete metaFile;
 
   wxXMetaFile *metaFile = new wxXMetaFile;
 
   if (!metaFile->ReadFile(filename))
   {
     delete metaFile;

-    return FALSE;
+    return false;

   }
 
   double lastX = 0.0;
   }
 
   double lastX = 0.0;


@@ -2172,7 +2157,7 @@ bool wxPseudoMetaFile::LoadFromMetaFile(const wxString& filename, double *rwidth
   m_height = *rheight;
 
   delete metaFile;
   m_height = *rheight;
 
   delete metaFile;

-  return TRUE;
+  return true;

 }
 
 // Scale to fit size
 }
 
 // Scale to fit size


@@ -2202,6 +2187,7 @@ void wxPseudoMetaFile::GetBounds(double *boundMinX, double *boundMinY, double *b
       case DRAWOP_DRAW_RECT:
       case DRAWOP_DRAW_ROUNDED_RECT:
       case DRAWOP_DRAW_ELLIPSE:
       case DRAWOP_DRAW_RECT:
       case DRAWOP_DRAW_ROUNDED_RECT:
       case DRAWOP_DRAW_ELLIPSE:

+      case DRAWOP_DRAW_ELLIPTIC_ARC:

       case DRAWOP_DRAW_POINT:
       case DRAWOP_DRAW_TEXT:
       {
       case DRAWOP_DRAW_POINT:
       case DRAWOP_DRAW_TEXT:
       {


@@ -2219,7 +2205,8 @@ void wxPseudoMetaFile::GetBounds(double *boundMinX, double *boundMinY, double *b
         }
         else if (op->GetOp() == DRAWOP_DRAW_RECT ||
                  op->GetOp() == DRAWOP_DRAW_ROUNDED_RECT ||
         }
         else if (op->GetOp() == DRAWOP_DRAW_RECT ||
                  op->GetOp() == DRAWOP_DRAW_ROUNDED_RECT ||

-                 op->GetOp() == DRAWOP_DRAW_ELLIPSE)
+                 op->GetOp() == DRAWOP_DRAW_ELLIPSE ||
+                 op->GetOp() == DRAWOP_DRAW_ELLIPTIC_ARC)

         {
           if ((opDraw->m_x1 + opDraw->m_x2) < minX) minX = (opDraw->m_x1 + opDraw->m_x2);
           if ((opDraw->m_x1 + opDraw->m_x2) > maxX) maxX = (opDraw->m_x1 + opDraw->m_x2);
         {
           if ((opDraw->m_x1 + opDraw->m_x2) < minX) minX = (opDraw->m_x1 + opDraw->m_x2);
           if ((opDraw->m_x1 + opDraw->m_x2) > maxX) maxX = (opDraw->m_x1 + opDraw->m_x2);


@@ -2342,7 +2329,7 @@ void wxPseudoMetaFile::DrawArc(const wxPoint& centrePt, const wxPoint& startPt,
 
 void wxPseudoMetaFile::DrawEllipticArc(const wxRect& rect, double startAngle, double endAngle)
 {
 
 void wxPseudoMetaFile::DrawEllipticArc(const wxRect& rect, double startAngle, double endAngle)
 {

-    const double pi = 3.1415926535897932384626433832795 ;
+    const double pi = M_PI ;

 
     double startAngleRadians = startAngle* (pi*2.0/360.0);
     double endAngleRadians = endAngle* (pi*2.0/360.0);
 
     double startAngleRadians = startAngle* (pi*2.0/360.0);
     double endAngleRadians = endAngle* (pi*2.0/360.0);


@@ -2369,7 +2356,7 @@ void wxPseudoMetaFile::DrawText(const wxString& text, const wxPoint& pt)
     wxOpDraw *theOp = new wxOpDraw(DRAWOP_DRAW_TEXT,
           (double) pt.x, (double) pt.y, 0.0, 0.0);
 
     wxOpDraw *theOp = new wxOpDraw(DRAWOP_DRAW_TEXT,
           (double) pt.x, (double) pt.y, 0.0, 0.0);
 

-    theOp->m_textString = copystring(text);
+    theOp->m_textString = text;

 
     m_ops.Append(theOp);
 }
 
     m_ops.Append(theOp);
 }


@@ -2418,7 +2405,7 @@ void wxPseudoMetaFile::DrawSpline(int n, wxPoint pts[])
 
 void wxPseudoMetaFile::SetClippingRect(const wxRect& rect)
 {
 
 void wxPseudoMetaFile::SetClippingRect(const wxRect& rect)
 {

-    wxOpSetClipping* theOp = new wxOpSetClipping(DRAWOP_SET_CLIPPING_RECT,
+    /* wxOpSetClipping* theOp = */ new wxOpSetClipping(DRAWOP_SET_CLIPPING_RECT,

         (double) rect.x, (double) rect.y, (double) rect.width, (double) rect.height);
 }
 
         (double) rect.x, (double) rect.y, (double) rect.width, (double) rect.height);
 }