Added missing fldef.h to makefile

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

diff --git a/contrib/src/ogl/basic2.cpp b/contrib/src/ogl/basic2.cpp
index f329aa565496626cb4711a5aecf654cc27940ff2..e12fa3e07caaaa6a653e1be1b882d38bd711027e 100644 (file)
--- a/contrib/src/ogl/basic2.cpp
+++ b/contrib/src/ogl/basic2.cpp
@@ -581,13 +581,13 @@ void wxPolygonShape::ResetControlPoints()
 }
 
 
-#ifdef PROLOGIO
+#if wxUSE_PROLOGIO
 void wxPolygonShape::WriteAttributes(wxExpr *clause)
 {
   wxShape::WriteAttributes(clause);
 
-  clause->AddAttributeValue("x", m_xpos);
-  clause->AddAttributeValue("y", m_ypos);
+  clause->AddAttributeValue(wxT("x"), m_xpos);
+  clause->AddAttributeValue(wxT("y"), m_ypos);
 
   // Make a list of lists for the coordinates
   wxExpr *list = new wxExpr(wxExprList);
@@ -605,7 +605,7 @@ void wxPolygonShape::WriteAttributes(wxExpr *clause)
 
     node = node->Next();
   }
-  clause->AddAttributeValue("points", list);
+  clause->AddAttributeValue(wxT("points"), list);
 
   // Save the original (unscaled) points
   list = new wxExpr(wxExprList);
@@ -622,7 +622,7 @@ void wxPolygonShape::WriteAttributes(wxExpr *clause)
 
     node = node->Next();
   }
-  clause->AddAttributeValue("m_originalPoints", list);
+  clause->AddAttributeValue(wxT("m_originalPoints"), list);
 }
 
 void wxPolygonShape::ReadAttributes(wxExpr *clause)
@@ -634,7 +634,7 @@ void wxPolygonShape::ReadAttributes(wxExpr *clause)
   m_originalPoints = new wxList;
 
   wxExpr *points_list = NULL;
-  clause->AssignAttributeValue("points", &points_list);
+  clause->AssignAttributeValue(wxT("points"), &points_list);
 
   // If no points_list, don't crash!! Assume a diamond instead.
   double the_height = 100.0;
@@ -676,7 +676,7 @@ void wxPolygonShape::ReadAttributes(wxExpr *clause)
   }
 
   points_list = NULL;
-  clause->AssignAttributeValue("m_originalPoints", &points_list);
+  clause->AssignAttributeValue(wxT("m_originalPoints"), &points_list);
 
   // If no points_list, don't crash!! Assume a diamond instead.
   if (!points_list)
@@ -940,25 +940,25 @@ bool wxRectangleShape::GetPerimeterPoint(double x1, double y1,
   return TRUE;
 }
 
-#ifdef PROLOGIO
+#if wxUSE_PROLOGIO
 void wxRectangleShape::WriteAttributes(wxExpr *clause)
 {
   wxShape::WriteAttributes(clause);
-  clause->AddAttributeValue("x", m_xpos);
-  clause->AddAttributeValue("y", m_ypos);
+  clause->AddAttributeValue(wxT("x"), m_xpos);
+  clause->AddAttributeValue(wxT("y"), m_ypos);
 
-  clause->AddAttributeValue("width", m_width);
-  clause->AddAttributeValue("height", m_height);
+  clause->AddAttributeValue(wxT("width"), m_width);
+  clause->AddAttributeValue(wxT("height"), m_height);
   if (m_cornerRadius != 0.0)
-    clause->AddAttributeValue("corner", m_cornerRadius);
+    clause->AddAttributeValue(wxT("corner"), m_cornerRadius);
 }
 
 void wxRectangleShape::ReadAttributes(wxExpr *clause)
 {
   wxShape::ReadAttributes(clause);
-  clause->AssignAttributeValue("width", &m_width);
-  clause->AssignAttributeValue("height", &m_height);
-  clause->AssignAttributeValue("corner", &m_cornerRadius);
+  clause->AssignAttributeValue(wxT("width"), &m_width);
+  clause->AssignAttributeValue(wxT("height"), &m_height);
+  clause->AssignAttributeValue(wxT("corner"), &m_cornerRadius);
 
   // In case we're reading an old file, set the region's size
   if (m_regions.Number() == 1)
@@ -1013,7 +1013,7 @@ void wxTextShape::Copy(wxShape& copy)
   wxRectangleShape::Copy(copy);
 }
 
-#ifdef PROLOGIO
+#if wxUSE_PROLOGIO
 void wxTextShape::WriteAttributes(wxExpr *clause)
 {
   wxRectangleShape::WriteAttributes(clause);
@@ -1080,22 +1080,22 @@ void wxEllipseShape::SetSize(double x, double y, bool recursive)
   SetDefaultRegionSize();
 }
 
-#ifdef PROLOGIO
+#if wxUSE_PROLOGIO
 void wxEllipseShape::WriteAttributes(wxExpr *clause)
 {
   wxShape::WriteAttributes(clause);
-  clause->AddAttributeValue("x", m_xpos);
-  clause->AddAttributeValue("y", m_ypos);
+  clause->AddAttributeValue(wxT("x"), m_xpos);
+  clause->AddAttributeValue(wxT("y"), m_ypos);
 
-  clause->AddAttributeValue("width", m_width);
-  clause->AddAttributeValue("height", m_height);
+  clause->AddAttributeValue(wxT("width"), m_width);
+  clause->AddAttributeValue(wxT("height"), m_height);
 }
 
 void wxEllipseShape::ReadAttributes(wxExpr *clause)
 {
   wxShape::ReadAttributes(clause);
-  clause->AssignAttributeValue("width", &m_width);
-  clause->AssignAttributeValue("height", &m_height);
+  clause->AssignAttributeValue(wxT("width"), &m_width);
+  clause->AssignAttributeValue(wxT("height"), &m_height);
 
   // In case we're reading an old file, set the region's size
   if (m_regions.Number() == 1)
@@ -1761,7 +1761,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxShapeRegion, wxObject)
 
 wxShapeRegion::wxShapeRegion()
 {
-  m_regionText = "";
+  m_regionText = wxEmptyString;
   m_font = g_oglNormalFont;
   m_minHeight = 5.0;
   m_minWidth = 5.0;
@@ -1773,9 +1773,9 @@ wxShapeRegion::wxShapeRegion()
   m_regionProportionX = -1.0;
   m_regionProportionY = -1.0;
   m_formatMode = FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT;
-  m_regionName = "";
-  m_textColour = "BLACK";
-  m_penColour = "BLACK";
+  m_regionName = wxEmptyString;
+  m_textColour = wxT("BLACK");
+  m_penColour = wxT("BLACK");
   m_penStyle = wxSOLID;
   m_actualColourObject = NULL;
   m_actualPenObject = NULL;
@@ -1897,7 +1897,7 @@ wxPen *wxShapeRegion::GetActualPen()
     return m_actualPenObject;
 
   if (!m_penColour) return NULL;
-  if (m_penColour == "Invisible")
+  if (m_penColour == wxT("Invisible"))
     return NULL;
   m_actualPenObject = wxThePenList->FindOrCreatePen(m_penColour, 1, m_penStyle);
   return m_actualPenObject;