Added support for toggle button on OS/2.

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

diff --git a/contrib/src/ogl/basic.cpp b/contrib/src/ogl/basic.cpp
index f5f513f79897a6e46f768c787b015e706c0b5d6a..77c69ff50aca88714efadb3e7acf0e9e59f94bfc 100644 (file)
--- a/contrib/src/ogl/basic.cpp
+++ b/contrib/src/ogl/basic.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__


@@ -34,7 +34,6 @@
 
 #include <stdio.h>
 #include <ctype.h>
 
 #include <stdio.h>
 #include <ctype.h>

-#include <math.h>

 
 #include "wx/ogl/ogl.h"
 
 
 #include "wx/ogl/ogl.h"
 


@@ -137,7 +136,7 @@ bool wxShapeEvtHandler::OnMovePre(wxDC& dc, double x, double y, double old_x, do
   if (m_previousHandler)
     return m_previousHandler->OnMovePre(dc, x, y, old_x, old_y, display);
   else
   if (m_previousHandler)
     return m_previousHandler->OnMovePre(dc, x, y, old_x, old_y, display);
   else

-    return TRUE;
+    return true;

 }
 
 void wxShapeEvtHandler::OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display)
 }
 
 void wxShapeEvtHandler::OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display)


@@ -270,7 +269,7 @@ wxShape::wxShape(wxShapeCanvas *can)
   m_eventHandler = this;
   SetShape(this);
   m_id = 0;
   m_eventHandler = this;
   SetShape(this);
   m_id = 0;

-  m_formatted = FALSE;
+  m_formatted = false;

   m_canvas = can;
   m_xpos = 0.0; m_ypos = 0.0;
   m_pen = g_oglBlackPen;
   m_canvas = can;
   m_xpos = 0.0; m_ypos = 0.0;
   m_pen = g_oglBlackPen;


@@ -278,16 +277,16 @@ wxShape::wxShape(wxShapeCanvas *can)
   m_font = g_oglNormalFont;
   m_textColour = wxT("BLACK");
   m_textColourName = wxT("BLACK");
   m_font = g_oglNormalFont;
   m_textColour = wxT("BLACK");
   m_textColourName = wxT("BLACK");

-  m_visible = FALSE;
-  m_selected = FALSE;
+  m_visible = false;
+  m_selected = false;

   m_attachmentMode = ATTACHMENT_MODE_NONE;
   m_attachmentMode = ATTACHMENT_MODE_NONE;

-  m_spaceAttachments = TRUE;
-  m_disableLabel = FALSE;
-  m_fixedWidth = FALSE;
-  m_fixedHeight = FALSE;
-  m_drawHandles = TRUE;
+  m_spaceAttachments = true;
+  m_disableLabel = false;
+  m_fixedWidth = false;
+  m_fixedHeight = false;
+  m_drawHandles = true;

   m_sensitivity = OP_ALL;
   m_sensitivity = OP_ALL;

-  m_draggable = TRUE;
+  m_draggable = true;

   m_parent = NULL;
   m_formatMode = FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT;
   m_shadowMode = SHADOW_NONE;
   m_parent = NULL;
   m_formatMode = FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT;
   m_shadowMode = SHADOW_NONE;


@@ -297,9 +296,9 @@ wxShape::wxShape(wxShapeCanvas *can)
   m_textMarginX = 5;
   m_textMarginY = 5;
   m_regionName = wxT("0");
   m_textMarginX = 5;
   m_textMarginY = 5;
   m_regionName = wxT("0");

-  m_centreResize = TRUE;
-  m_maintainAspectRatio = FALSE;
-  m_highlighted = FALSE;
+  m_centreResize = true;
+  m_maintainAspectRatio = false;
+  m_highlighted = false;

   m_rotation = 0.0;
   m_branchNeckLength = 10;
   m_branchStemLength = 10;
   m_rotation = 0.0;
   m_branchNeckLength = 10;
   m_branchStemLength = 10;


@@ -349,9 +348,9 @@ void wxShape::SetHighlight(bool hi, bool recurse)
 void wxShape::SetSensitivityFilter(int sens, bool recursive)
 {
   if (sens & OP_DRAG_LEFT)
 void wxShape::SetSensitivityFilter(int sens, bool recursive)
 {
   if (sens & OP_DRAG_LEFT)

-    m_draggable = TRUE;
+    m_draggable = true;

   else
   else

-    m_draggable = FALSE;
+    m_draggable = false;

 
   m_sensitivity = sens;
   if (recursive)
 
   m_sensitivity = sens;
   if (recursive)


@@ -360,7 +359,7 @@ void wxShape::SetSensitivityFilter(int sens, bool recursive)
     while (node)
     {
       wxShape *obj = (wxShape *)node->GetData();
     while (node)
     {
       wxShape *obj = (wxShape *)node->GetData();

-      obj->SetSensitivityFilter(sens, TRUE);
+      obj->SetSensitivityFilter(sens, true);

       node = node->GetNext();
     }
   }
       node = node->GetNext();
     }
   }


@@ -381,7 +380,7 @@ void wxShape::SetDraggable(bool drag, bool recursive)
     while (node)
     {
       wxShape *obj = (wxShape *)node->GetData();
     while (node)
     {
       wxShape *obj = (wxShape *)node->GetData();

-      obj->SetDraggable(drag, TRUE);
+      obj->SetDraggable(drag, true);

       node = node->GetNext();
     }
   }
       node = node->GetNext();
     }
   }


@@ -463,7 +462,7 @@ void wxShape::InsertInCanvas(wxShapeCanvas *theCanvas)
 void wxShape::RemoveFromCanvas(wxShapeCanvas *theCanvas)
 {
   if (Selected())
 void wxShape::RemoveFromCanvas(wxShapeCanvas *theCanvas)
 {
   if (Selected())

-    Select(FALSE);
+    Select(false);

   theCanvas->RemoveShape(this);
   wxNode *node = m_children.GetFirst();
   while (node)
   theCanvas->RemoveShape(this);
   wxNode *node = m_children.GetFirst();
   while (node)


@@ -491,9 +490,9 @@ void wxShape::ClearText(int regionId)
 {
   if (regionId == 0)
   {
 {
   if (regionId == 0)
   {

-    m_text.DeleteContents(TRUE);
+    m_text.DeleteContents(true);

     m_text.Clear();
     m_text.Clear();

-    m_text.DeleteContents(FALSE);
+    m_text.DeleteContents(false);

   }
   wxNode *node = m_regions.Item(regionId);
   if (!node)
   }
   wxNode *node = m_regions.Item(regionId);
   if (!node)


@@ -533,7 +532,7 @@ void wxShape::SetDefaultRegionSize()
 bool wxShape::HitTest(double x, double y, int *attachment, double *distance)
 {
 //  if (!sensitive)
 bool wxShape::HitTest(double x, double y, int *attachment, double *distance)
 {
 //  if (!sensitive)

-//    return FALSE;
+//    return false;

 
   double width = 0.0, height = 0.0;
   GetBoundingBoxMin(&width, &height);
 
   double width = 0.0, height = 0.0;
   GetBoundingBoxMin(&width, &height);


@@ -577,15 +576,15 @@ bool wxShape::HitTest(double x, double y, int *attachment, double *distance)
     }
     *attachment = nearest_attachment;
     *distance = nearest;
     }
     *attachment = nearest_attachment;
     *distance = nearest;

-    return TRUE;
+    return true;

   }
   }

-  else return FALSE;
+  else return false;

 }
 
 // Format a text string according to the region size, adding
 // strings with positions to region text list
 
 }
 
 // Format a text string according to the region size, adding
 // strings with positions to region text list
 

-static bool GraphicsInSizeToContents = FALSE; // Infinite recursion elimination
+static bool GraphicsInSizeToContents = false; // Infinite recursion elimination

 void wxShape::FormatText(wxDC& dc, const wxString& s, int i)
 {
   double w, h;
 void wxShape::FormatText(wxDC& dc, const wxString& s, int i)
 {
   double w, h;


@@ -604,7 +603,7 @@ void wxShape::FormatText(wxDC& dc, const wxString& s, int i)
 
   region->GetSize(&w, &h);
 
 
   region->GetSize(&w, &h);
 

-  wxStringList *stringList = oglFormatText(dc, s, (w-5), (h-5), region->GetFormatMode());
+  wxStringList *stringList = oglFormatText(dc, s, (w-2*m_textMarginX), (h-2*m_textMarginY), region->GetFormatMode());

   node = (wxNode*)stringList->GetFirst();
   while (node)
   {
   node = (wxNode*)stringList->GetFirst();
   while (node)
   {


@@ -623,7 +622,7 @@ void wxShape::FormatText(wxDC& dc, const wxString& s, int i)
       (m_regions.GetCount() == 1) && !GraphicsInSizeToContents)
   {
     oglGetCentredTextExtent(dc, &(region->GetFormattedText()), m_xpos, m_ypos, w, h, &actualW, &actualH);
       (m_regions.GetCount() == 1) && !GraphicsInSizeToContents)
   {
     oglGetCentredTextExtent(dc, &(region->GetFormattedText()), m_xpos, m_ypos, w, h, &actualW, &actualH);

-    if ((actualW+m_textMarginX != w ) || (actualH+m_textMarginY != h))
+    if ((actualW+2*m_textMarginX != w ) || (actualH+2*m_textMarginY != h))

     {
       // If we are a descendant of a composite, must make sure the composite gets
       // resized properly
     {
       // If we are a descendant of a composite, must make sure the composite gets
       // resized properly


@@ -632,11 +631,11 @@ void wxShape::FormatText(wxDC& dc, const wxString& s, int i)
       if (topAncestor != this)
       {
         // Make sure we don't recurse infinitely
       if (topAncestor != this)
       {
         // Make sure we don't recurse infinitely

-        GraphicsInSizeToContents = TRUE;
+        GraphicsInSizeToContents = true;

 
         wxCompositeShape *composite = (wxCompositeShape *)topAncestor;
         composite->Erase(dc);
 
         wxCompositeShape *composite = (wxCompositeShape *)topAncestor;
         composite->Erase(dc);

-        SetSize(actualW+m_textMarginX, actualH+m_textMarginY);
+        SetSize(actualW+2*m_textMarginX, actualH+2*m_textMarginY);

         Move(dc, m_xpos, m_ypos);
         composite->CalculateSize();
         if (composite->Selected())
         Move(dc, m_xpos, m_ypos);
         composite->CalculateSize();
         if (composite->Selected())


@@ -648,21 +647,21 @@ void wxShape::FormatText(wxDC& dc, const wxString& s, int i)
         // Where infinite recursion might happen if we didn't stop it
         composite->Draw(dc);
 
         // Where infinite recursion might happen if we didn't stop it
         composite->Draw(dc);
 

-        GraphicsInSizeToContents = FALSE;
+        GraphicsInSizeToContents = false;

       }
       else
       {
         Erase(dc);
       }
       else
       {
         Erase(dc);

-        SetSize(actualW+m_textMarginX, actualH+m_textMarginY);
+        SetSize(actualW+2*m_textMarginX, actualH+2*m_textMarginY);

         Move(dc, m_xpos, m_ypos);
       }
         Move(dc, m_xpos, m_ypos);
       }

-      SetSize(actualW+m_textMarginX, actualH+m_textMarginY);
+      SetSize(actualW+2*m_textMarginX, actualH+2*m_textMarginY);

       Move(dc, m_xpos, m_ypos);
       EraseContents(dc);
     }
   }
       Move(dc, m_xpos, m_ypos);
       EraseContents(dc);
     }
   }

-  oglCentreText(dc, &(region->GetFormattedText()), m_xpos, m_ypos, actualW, actualH, region->GetFormatMode());
-  m_formatted = TRUE;
+  oglCentreText(dc, &(region->GetFormattedText()), m_xpos, m_ypos, actualW-2*m_textMarginX, actualH-2*m_textMarginY, region->GetFormatMode());
+  m_formatted = true;

 }
 
 void wxShape::Recentre(wxDC& dc)
 }
 
 void wxShape::Recentre(wxDC& dc)


@@ -677,7 +676,7 @@ void wxShape::Recentre(wxDC& dc)
     if (node)
     {
       wxShapeRegion *region = (wxShapeRegion *)node->GetData();
     if (node)
     {
       wxShapeRegion *region = (wxShapeRegion *)node->GetData();

-      oglCentreText(dc, &(region->GetFormattedText()), m_xpos, m_ypos, w, h, region->GetFormatMode());
+      oglCentreText(dc, &(region->GetFormattedText()), m_xpos, m_ypos, w-2*m_textMarginX, h-2*m_textMarginY, region->GetFormatMode());

     }
   }
 }
     }
   }
 }


@@ -686,7 +685,7 @@ bool wxShape::GetPerimeterPoint(double WXUNUSED(x1), double WXUNUSED(y1),
                                      double WXUNUSED(x2), double WXUNUSED(y2),
                                      double *WXUNUSED(x3), double *WXUNUSED(y3))
 {
                                      double WXUNUSED(x2), double WXUNUSED(y2),
                                      double *WXUNUSED(x3), double *WXUNUSED(y3))
 {

-  return FALSE;
+  return false;

 }
 
 void wxShape::SetPen(wxPen *the_pen)
 }
 
 void wxShape::SetPen(wxPen *the_pen)


@@ -923,12 +922,12 @@ void wxShape::OnDrawContents(wxDC& dc)
     dc.SetBackgroundMode(wxTRANSPARENT);
     if (!m_formatted)
     {
     dc.SetBackgroundMode(wxTRANSPARENT);
     if (!m_formatted)
     {

-      oglCentreText(dc, &(region->GetFormattedText()), m_xpos, m_ypos, bound_x, bound_y, region->GetFormatMode());
-      m_formatted = TRUE;
+      oglCentreText(dc, &(region->GetFormattedText()), m_xpos, m_ypos, bound_x-2*m_textMarginX, bound_y-2*m_textMarginY, region->GetFormatMode());
+      m_formatted = true;

     }
     if (!GetDisableLabel())
     {
     }
     if (!GetDisableLabel())
     {

-      oglDrawFormattedText(dc, &(region->GetFormattedText()), m_xpos, m_ypos, bound_x, bound_y, region->GetFormatMode());
+      oglDrawFormattedText(dc, &(region->GetFormattedText()), m_xpos, m_ypos, bound_x-2*m_textMarginX, bound_y-2*m_textMarginY, region->GetFormatMode());

     }
 }
 
     }
 }
 


@@ -943,7 +942,7 @@ void wxShape::OnSize(double WXUNUSED(x), double WXUNUSED(y))
 
 bool wxShape::OnMovePre(wxDC& WXUNUSED(dc), double WXUNUSED(x), double WXUNUSED(y), double WXUNUSED(old_x), double WXUNUSED(old_y), bool WXUNUSED(display))
 {
 
 bool wxShape::OnMovePre(wxDC& WXUNUSED(dc), double WXUNUSED(x), double WXUNUSED(y), double WXUNUSED(old_x), double WXUNUSED(old_y), bool WXUNUSED(display))
 {

-  return TRUE;
+  return true;

 }
 
 void wxShape::OnMovePost(wxDC& WXUNUSED(dc), double WXUNUSED(x), double WXUNUSED(y), double WXUNUSED(old_x), double WXUNUSED(old_y), bool WXUNUSED(display))
 }
 
 void wxShape::OnMovePost(wxDC& WXUNUSED(dc), double WXUNUSED(x), double WXUNUSED(y), double WXUNUSED(old_x), double WXUNUSED(old_y), bool WXUNUSED(display))


@@ -1043,7 +1042,7 @@ void wxShape::DrawLinks(wxDC& dc, int attachment, bool recurse)
   }
 }
 
   }
 }
 

-// Returns TRUE if pt1 <= pt2 in the sense that one point comes before another on an
+// Returns true if pt1 <= pt2 in the sense that one point comes before another on an

 // edge of the shape.
 // attachmentPoint is the attachment point (= side) in question.
 
 // edge of the shape.
 // attachmentPoint is the attachment point (= side) in question.
 


@@ -1065,14 +1064,14 @@ bool wxShape::AttachmentSortTest(int attachmentPoint, const wxRealPoint& pt1, co
         }
     }
 
         }
     }
 

-    return FALSE;
+    return false;

 }
 
 bool wxShape::MoveLineToNewAttachment(wxDC& dc, wxLineShape *to_move,
                                        double x, double y)
 {
   if (GetAttachmentMode() == ATTACHMENT_MODE_NONE)
 }
 
 bool wxShape::MoveLineToNewAttachment(wxDC& dc, wxLineShape *to_move,
                                        double x, double y)
 {
   if (GetAttachmentMode() == ATTACHMENT_MODE_NONE)

-      return FALSE;
+      return false;

 
   int newAttachment, oldAttachment;
   double distance;
 
   int newAttachment, oldAttachment;
   double distance;


@@ -1081,7 +1080,7 @@ bool wxShape::MoveLineToNewAttachment(wxDC& dc, wxLineShape *to_move,
   // the user has moved the point to
   bool hit = HitTest(x, y, &newAttachment, &distance);
   if (!hit)
   // the user has moved the point to
   bool hit = HitTest(x, y, &newAttachment, &distance);
   if (!hit)

-    return FALSE;
+    return false;

 
   EraseLinks(dc);
 
 
   EraseLinks(dc);
 


@@ -1109,7 +1108,7 @@ bool wxShape::MoveLineToNewAttachment(wxDC& dc, wxLineShape *to_move,
   double old_y = (double) -99999.9;
 
   node = newOrdering.GetFirst();
   double old_y = (double) -99999.9;
 
   node = newOrdering.GetFirst();

-  bool found = FALSE;
+  bool found = false;

 
   while (!found && node)
   {
 
   while (!found && node)
   {


@@ -1136,7 +1135,7 @@ bool wxShape::MoveLineToNewAttachment(wxDC& dc, wxLineShape *to_move,
 
       if (AttachmentSortTest(newAttachment, newPoint, thisPoint) && AttachmentSortTest(newAttachment, lastPoint, newPoint))
       {
 
       if (AttachmentSortTest(newAttachment, newPoint, thisPoint) && AttachmentSortTest(newAttachment, lastPoint, newPoint))
       {

-        found = TRUE;
+        found = true;

         newOrdering.Insert(node, to_move);
       }
 
         newOrdering.Insert(node, to_move);
       }
 


@@ -1151,7 +1150,7 @@ bool wxShape::MoveLineToNewAttachment(wxDC& dc, wxLineShape *to_move,
 
   GetEventHandler()->OnChangeAttachment(newAttachment, to_move, newOrdering);
 
 
   GetEventHandler()->OnChangeAttachment(newAttachment, to_move, newOrdering);
 

-  return TRUE;
+  return true;

 }
 
 void wxShape::OnChangeAttachment(int attachment, wxLineShape* line, wxList& ordering)
 }
 
 void wxShape::OnChangeAttachment(int attachment, wxLineShape* line, wxList& ordering)


@@ -1313,7 +1312,7 @@ void wxShape::OnDragLeft(bool draw, double x, double y, int keys, int attachment
 
   dc.SetLogicalFunction(OGLRBLF);
 
 
   dc.SetLogicalFunction(OGLRBLF);
 

-  wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT);
+  wxPen dottedPen(*wxBLACK, 1, wxDOT);

   dc.SetPen(dottedPen);
   dc.SetBrush(* wxTRANSPARENT_BRUSH);
 
   dc.SetPen(dottedPen);
   dc.SetBrush(* wxTRANSPARENT_BRUSH);
 


@@ -1358,7 +1357,7 @@ void wxShape::OnBeginDragLeft(double x, double y, int keys, int attachment)
 //  m_xpos = xx; m_ypos = yy;
   dc.SetLogicalFunction(OGLRBLF);
 
 //  m_xpos = xx; m_ypos = yy;
   dc.SetLogicalFunction(OGLRBLF);
 

-  wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT);
+  wxPen dottedPen(*wxBLACK, 1, wxDOT);

   dc.SetPen(dottedPen);
   dc.SetBrush((* wxTRANSPARENT_BRUSH));
 
   dc.SetPen(dottedPen);
   dc.SetBrush((* wxTRANSPARENT_BRUSH));
 


@@ -1370,6 +1369,8 @@ void wxShape::OnBeginDragLeft(double x, double y, int keys, int attachment)
 
 void wxShape::OnEndDragLeft(double x, double y, int keys, int attachment)
 {
 
 void wxShape::OnEndDragLeft(double x, double y, int keys, int attachment)
 {

+  if (!m_draggable)
+    return;

   m_canvas->ReleaseMouse();
   if ((m_sensitivity & OP_DRAG_LEFT) != OP_DRAG_LEFT)
   {
   m_canvas->ReleaseMouse();
   if ((m_sensitivity & OP_DRAG_LEFT) != OP_DRAG_LEFT)
   {


@@ -1547,7 +1548,7 @@ void wxShape::Erase(wxDC& dc)
 {
   GetEventHandler()->OnErase(dc);
   GetEventHandler()->OnEraseControlPoints(dc);
 {
   GetEventHandler()->OnErase(dc);
   GetEventHandler()->OnEraseControlPoints(dc);

-  GetEventHandler()->OnDrawBranches(dc, TRUE);
+  GetEventHandler()->OnDrawBranches(dc, true);

 }
 
 void wxShape::EraseContents(wxDC& dc)
 }
 
 void wxShape::EraseContents(wxDC& dc)


@@ -1566,7 +1567,7 @@ void wxShape::AddText(const wxString& string)
       new wxShapeTextLine(0.0, 0.0, string);
   region->GetFormattedText().Append(new_line);
 
       new wxShapeTextLine(0.0, 0.0, string);
   region->GetFormattedText().Append(new_line);
 

-  m_formatted = FALSE;
+  m_formatted = false;

 }
 
 void wxShape::SetSize(double x, double y, bool WXUNUSED(recursive))
 }
 
 void wxShape::SetSize(double x, double y, bool WXUNUSED(recursive))


@@ -1759,10 +1760,10 @@ void wxShape::WriteAttributes(wxExpr *clause)
     clause->AddAttributeValue(_T("fixed_height"), (long)m_fixedHeight);
   if (m_shadowMode != SHADOW_NONE)
     clause->AddAttributeValue(_T("shadow_mode"), (long)m_shadowMode);
     clause->AddAttributeValue(_T("fixed_height"), (long)m_fixedHeight);
   if (m_shadowMode != SHADOW_NONE)
     clause->AddAttributeValue(_T("shadow_mode"), (long)m_shadowMode);

-  if (m_centreResize != TRUE)
+  if (m_centreResize != true)

     clause->AddAttributeValue(_T("centre_resize"), (long)0);
   clause->AddAttributeValue(_T("maintain_aspect_ratio"), (long) m_maintainAspectRatio);
     clause->AddAttributeValue(_T("centre_resize"), (long)0);
   clause->AddAttributeValue(_T("maintain_aspect_ratio"), (long) m_maintainAspectRatio);

-  if (m_highlighted != FALSE)
+  if (m_highlighted != false)

     clause->AddAttributeValue(_T("hilite"), (long)m_highlighted);
 
   if (m_parent) // For composite objects
     clause->AddAttributeValue(_T("hilite"), (long)m_highlighted);
 
   if (m_parent) // For composite objects


@@ -1882,7 +1883,7 @@ void wxShape::ReadAttributes(wxExpr *clause)
   wxExpr *strings = clause->AttributeValue(_T("text"));
   if (strings && strings->Type() == wxExprList)
   {
   wxExpr *strings = clause->AttributeValue(_T("text"));
   if (strings && strings->Type() == wxExprList)
   {

-    m_formatted = TRUE;  // Assume text is formatted unless we prove otherwise
+    m_formatted = true;  // Assume text is formatted unless we prove otherwise

     wxExpr *node = strings->value.first;
     while (node)
     {
     wxExpr *node = strings->value.first;
     while (node)
     {


@@ -1896,7 +1897,7 @@ void wxShape::ReadAttributes(wxExpr *clause)
       if (string_expr->Type() == wxExprString)
       {
         the_string = string_expr->StringValue();
       if (string_expr->Type() == wxExprString)
       {
         the_string = string_expr->StringValue();

-        m_formatted = FALSE;
+        m_formatted = false;

       }
       else if (string_expr->Type() == wxExprList)
       {
       }
       else if (string_expr->Type() == wxExprList)
       {


@@ -2068,7 +2069,7 @@ void wxShape::ReadRegions(wxExpr *clause)
   wxSprintf(regionNameBuf, _T("region%d"), regionNo);
   wxSprintf(textNameBuf, _T("text%d"), regionNo);
 
   wxSprintf(regionNameBuf, _T("region%d"), regionNo);
   wxSprintf(textNameBuf, _T("text%d"), regionNo);
 

-  m_formatted = TRUE;  // Assume text is formatted unless we prove otherwise
+  m_formatted = true;  // Assume text is formatted unless we prove otherwise

 
   while ((regionExpr = clause->AttributeValue(regionNameBuf)) != NULL)
   {
 
   while ((regionExpr = clause->AttributeValue(regionNameBuf)) != NULL)
   {


@@ -2189,7 +2190,7 @@ void wxShape::ReadRegions(wxExpr *clause)
         if (string_expr->Type() == wxExprString)
         {
           the_string = string_expr->StringValue();
         if (string_expr->Type() == wxExprString)
         {
           the_string = string_expr->StringValue();

-          m_formatted = FALSE;
+          m_formatted = false;

         }
         else if (string_expr->Type() == wxExprList)
         {
         }
         else if (string_expr->Type() == wxExprList)
         {


@@ -2620,9 +2621,9 @@ bool wxShape::Selected() const
 
 bool wxShape::AncestorSelected() const
 {
 
 bool wxShape::AncestorSelected() const
 {

-  if (m_selected) return TRUE;
+  if (m_selected) return true;

   if (!GetParent())
   if (!GetParent())

-    return FALSE;
+    return false;

   else
     return GetParent()->AncestorSelected();
 }
   else
     return GetParent()->AncestorSelected();
 }


@@ -2661,10 +2662,10 @@ bool wxShape::AttachmentIsValid(int attachment) const
   {
     wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();
     if (point->m_id == attachment)
   {
     wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();
     if (point->m_id == attachment)

-      return TRUE;
+      return true;

     node = node->GetNext();
   }
     node = node->GetNext();
   }

-  return FALSE;
+  return false;

 }
 
 bool wxShape::GetAttachmentPosition(int attachment, double *x, double *y,
 }
 
 bool wxShape::GetAttachmentPosition(int attachment, double *x, double *y,


@@ -2673,7 +2674,7 @@ bool wxShape::GetAttachmentPosition(int attachment, double *x, double *y,
     if (m_attachmentMode == ATTACHMENT_MODE_NONE)
     {
         *x = m_xpos; *y = m_ypos;
     if (m_attachmentMode == ATTACHMENT_MODE_NONE)
     {
         *x = m_xpos; *y = m_ypos;

-        return TRUE;
+        return true;

     }
     else if (m_attachmentMode == ATTACHMENT_MODE_BRANCHING)
     {
     }
     else if (m_attachmentMode == ATTACHMENT_MODE_BRANCHING)
     {


@@ -2681,7 +2682,7 @@ bool wxShape::GetAttachmentPosition(int attachment, double *x, double *y,
         GetBranchingAttachmentPoint(attachment, nth, pt, stemPt);
         *x = pt.x;
         *y = pt.y;
         GetBranchingAttachmentPoint(attachment, nth, pt, stemPt);
         *x = pt.x;
         *y = pt.y;

-        return TRUE;
+        return true;

     }
     else if (m_attachmentMode == ATTACHMENT_MODE_EDGE)
     {
     }
     else if (m_attachmentMode == ATTACHMENT_MODE_EDGE)
     {


@@ -2695,12 +2696,12 @@ bool wxShape::GetAttachmentPosition(int attachment, double *x, double *y,
                 {
                     *x = (double)(m_xpos + point->m_x);
                     *y = (double)(m_ypos + point->m_y);
                 {
                     *x = (double)(m_xpos + point->m_x);
                     *y = (double)(m_ypos + point->m_y);

-                    return TRUE;
+                    return true;

                 }
                 node = node->GetNext();
             }
             *x = m_xpos; *y = m_ypos;
                 }
                 node = node->GetNext();
             }
             *x = m_xpos; *y = m_ypos;

-            return FALSE;
+            return false;

         }
         else
         {
         }
         else
         {


@@ -2712,7 +2713,9 @@ bool wxShape::GetAttachmentPosition(int attachment, double *x, double *y,
             double left = (double)(m_xpos - w/2.0);
             double right = (double)(m_xpos + w/2.0);
 
             double left = (double)(m_xpos - w/2.0);
             double right = (double)(m_xpos + w/2.0);
 

+#if 0

             /* bool isEnd = */ (line && line->IsEnd(this));
             /* bool isEnd = */ (line && line->IsEnd(this));

+#endif

 
             int physicalAttachment = LogicalToPhysicalAttachment(attachment);
 
 
             int physicalAttachment = LogicalToPhysicalAttachment(attachment);
 


@@ -2753,13 +2756,13 @@ bool wxShape::GetAttachmentPosition(int attachment, double *x, double *y,
                 }
                 default:
                 {
                 }
                 default:
                 {

-                    return FALSE;
+                    return false;

                 }
             }
                 }
             }

-            return TRUE;
+            return true;

         }
     }
         }
     }

-    return FALSE;
+    return false;

 }
 
 void wxShape::GetBoundingBoxMax(double *w, double *h)
 }
 
 void wxShape::GetBoundingBoxMax(double *w, double *h)


@@ -2775,21 +2778,21 @@ void wxShape::GetBoundingBoxMax(double *w, double *h)
   *h = hh;
 }
 
   *h = hh;
 }
 

-// Returns TRUE if image is a descendant of this composite
+// Returns true if image is a descendant of this composite

 bool wxShape::HasDescendant(wxShape *image)
 {
   if (image == this)
 bool wxShape::HasDescendant(wxShape *image)
 {
   if (image == this)

-    return TRUE;
+    return true;

   wxNode *node = m_children.GetFirst();
   while (node)
   {
     wxShape *child = (wxShape *)node->GetData();
     bool ans = child->HasDescendant(image);
     if (ans)
   wxNode *node = m_children.GetFirst();
   while (node)
   {
     wxShape *child = (wxShape *)node->GetData();
     bool ans = child->HasDescendant(image);
     if (ans)

-      return TRUE;
+      return true;

     node = node->GetNext();
   }
     node = node->GetNext();
   }

-  return FALSE;
+  return false;

 }
 
 // Clears points from a list of wxRealPoints, and clears list
 }
 
 // Clears points from a list of wxRealPoints, and clears list


@@ -2814,7 +2817,7 @@ wxRealPoint wxShape::CalcSimpleAttachment(const wxRealPoint& pt1, const wxRealPo
     bool isEnd = (line && line->IsEnd(this));
 
     // Are we horizontal or vertical?
     bool isEnd = (line && line->IsEnd(this));
 
     // Are we horizontal or vertical?

-    bool isHorizontal = (oglRoughlyEqual(pt1.y, pt2.y) == TRUE);
+    bool isHorizontal = (oglRoughlyEqual(pt1.y, pt2.y) == true);

 
     double x, y;
 
 
     double x, y;
 


@@ -2854,7 +2857,7 @@ wxRealPoint wxShape::CalcSimpleAttachment(const wxRealPoint& pt1, const wxRealPo
     }
     else
     {
     }
     else
     {

-        wxASSERT( oglRoughlyEqual(pt1.x, pt2.x) == TRUE );
+        wxASSERT( oglRoughlyEqual(pt1.x, pt2.x) == true );

 
         wxRealPoint firstPoint, secondPoint;
         if (pt1.y > pt2.y)
 
         wxRealPoint firstPoint, secondPoint;
         if (pt1.y > pt2.y)


@@ -2911,7 +2914,7 @@ int wxShape::GetLinePosition(wxLineShape* line)
 //                      <- branching attachment point N-1
 
 // This function gets information about where branching connections go.
 //                      <- branching attachment point N-1
 
 // This function gets information about where branching connections go.

-// Returns FALSE if there are no lines at this attachment.
+// Returns false if there are no lines at this attachment.

 bool wxShape::GetBranchingAttachmentInfo(int attachment, wxRealPoint& root, wxRealPoint& neck,
     wxRealPoint& shoulder1, wxRealPoint& shoulder2)
 {
 bool wxShape::GetBranchingAttachmentInfo(int attachment, wxRealPoint& root, wxRealPoint& neck,
     wxRealPoint& shoulder1, wxRealPoint& shoulder2)
 {


@@ -2921,7 +2924,7 @@ bool wxShape::GetBranchingAttachmentInfo(int attachment, wxRealPoint& root, wxRe
     int lineCount = GetAttachmentLineCount(attachment);
 
     if (lineCount == 0)
     int lineCount = GetAttachmentLineCount(attachment);
 
     if (lineCount == 0)

-        return FALSE;
+        return false;

 
     int totalBranchLength = m_branchSpacing * (lineCount - 1);
 
 
     int totalBranchLength = m_branchSpacing * (lineCount - 1);
 


@@ -2984,7 +2987,7 @@ bool wxShape::GetBranchingAttachmentInfo(int attachment, wxRealPoint& root, wxRe
             break;
         }
     }
             break;
         }
     }

-    return TRUE;
+    return true;

 }
 
 // n is the number of the adjoining line, from 0 to N-1 where N is the number of lines
 }
 
 // n is the number of the adjoining line, from 0 to N-1 where N is the number of lines


@@ -3044,7 +3047,7 @@ bool wxShape::GetBranchingAttachmentPoint(int attachment, int n, wxRealPoint& pt
         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 // Get the number of lines at this attachment position.
 }
 
 // Get the number of lines at this attachment position.


@@ -3190,7 +3193,7 @@ bool wxShape::GetAttachmentPositionEdge(int attachment, double *x, double *y,
 // to logical (0 -> 1 if rotated by 90 degrees)
 int wxShape::PhysicalToLogicalAttachment(int physicalAttachment) const
 {
 // to logical (0 -> 1 if rotated by 90 degrees)
 int wxShape::PhysicalToLogicalAttachment(int physicalAttachment) const
 {

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

     int i;
     if (oglRoughlyEqual(GetRotation(), 0.0))
     {
     int i;
     if (oglRoughlyEqual(GetRotation(), 0.0))
     {


@@ -3222,7 +3225,7 @@ int wxShape::PhysicalToLogicalAttachment(int physicalAttachment) const
 // to physical (0 is always North)
 int wxShape::LogicalToPhysicalAttachment(int logicalAttachment) const
 {
 // to physical (0 is always North)
 int wxShape::LogicalToPhysicalAttachment(int logicalAttachment) const
 {

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

     int i;
     if (oglRoughlyEqual(GetRotation(), 0.0))
     {
     int i;
     if (oglRoughlyEqual(GetRotation(), 0.0))
     {


@@ -3252,7 +3255,7 @@ int wxShape::LogicalToPhysicalAttachment(int logicalAttachment) const
 
 void wxShape::Rotate(double WXUNUSED(x), double WXUNUSED(y), double theta)
 {
 
 void wxShape::Rotate(double WXUNUSED(x), double WXUNUSED(y), double theta)
 {

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

     m_rotation = theta;
     if (m_rotation < 0.0)
     {
     m_rotation = theta;
     if (m_rotation < 0.0)
     {