small fixes

[wxWidgets.git] / utils / ogl / src / divided.cpp

diff --git a/utils/ogl/src/divided.cpp b/utils/ogl/src/divided.cpp
index efee471e627fa7328ab26a7f8ba5da86eee915df..f178550d5cee1788a3b7e3af036725932bb6ebe7 100644 (file)
--- a/utils/ogl/src/divided.cpp
+++ b/utils/ogl/src/divided.cpp
@@ -24,9 +24,7 @@
 #include <wx/wx.h>
 #endif
 
-#ifdef PROLOGIO
 #include <wx/wxexpr.h>
-#endif
 
 #include "basic.h"
 #include "basicp.h"
@@ -83,7 +81,7 @@ void wxDividedShape::OnDrawContents(wxDC& dc)
   double leftX = (double)(m_xpos - (m_width / 2.0));
   double rightX = (double)(m_xpos + (m_width / 2.0));
 
-  if (m_pen) dc.SetPen(m_pen);
+  if (m_pen) dc.SetPen(* m_pen);
 
   if (m_textColour) dc.SetTextForeground(* m_textColour);
 
@@ -110,7 +108,7 @@ void wxDividedShape::OnDrawContents(wxDC& dc)
   while (node)
   {
     wxShapeRegion *region = (wxShapeRegion *)node->Data();
-    dc.SetFont(region->GetFont());
+    dc.SetFont(* region->GetFont());
     dc.SetTextForeground(* region->GetActualColourObject());
 
     double proportion =
@@ -130,7 +128,7 @@ void wxDividedShape::OnDrawContents(wxDC& dc)
       wxPen *regionPen = region->GetActualPen();
       if (regionPen)
       {
-        dc.SetPen(regionPen);
+        dc.SetPen(* regionPen);
         dc.DrawLine(WXROUND(leftX), WXROUND(y), WXROUND(rightX), WXROUND(y));
       }
     }
@@ -153,7 +151,7 @@ void wxDividedShape::SetRegionSizes()
 {
   if (GetRegions().Number() == 0)
     return;
-    
+
   double defaultProportion = (double)(GetRegions().Number() > 0 ? (1.0/((double)(GetRegions().Number()))) : 0.0);
   double currentY = (double)(m_ypos - (m_height / 2.0));
   double maxY = (double)(m_ypos + (m_height / 2.0));
@@ -186,7 +184,7 @@ bool wxDividedShape::GetAttachmentPosition(int attachment, double *x, double *y,
   wxLineShape *line)
 {
   int totalNumberAttachments = (GetRegions().Number() * 2) + 2;
-  if (!GetAttachmentMode() || (attachment >= totalNumberAttachments))
+  if ((GetAttachmentMode() == ATTACHMENT_MODE_NONE) || (attachment >= totalNumberAttachments))
   {
     return wxShape::GetAttachmentPosition(attachment, x, y, nth, no_arcs);
   }
@@ -305,7 +303,7 @@ bool wxDividedShape::GetAttachmentPosition(int attachment, double *x, double *y,
   return TRUE;
 }
 
-int wxDividedShape::GetNumberOfAttachments()
+int wxDividedShape::GetNumberOfAttachments() const
 {
   // There are two attachments for each region (left and right),
   // plus one on the top and one on the bottom.
@@ -418,14 +416,14 @@ void wxDividedShape::ResetMandatoryControlPoints()
 }
 
 #ifdef PROLOGIO
-void wxDividedShape::WritePrologAttributes(wxExpr *clause)
+void wxDividedShape::WriteAttributes(wxExpr *clause)
 {
-  wxRectangleShape::WritePrologAttributes(clause);
+  wxRectangleShape::WriteAttributes(clause);
 }
 
-void wxDividedShape::ReadPrologAttributes(wxExpr *clause)
+void wxDividedShape::ReadAttributes(wxExpr *clause)
 {
-  wxRectangleShape::ReadPrologAttributes(clause);
+  wxRectangleShape::ReadAttributes(clause);
 }
 #endif
 
@@ -442,7 +440,7 @@ void wxDividedShape::EditRegions()
 #if 0
   if (GetRegions().Number() < 2)
     return;
-    
+
   wxBeginBusyCursor();
 
   GraphicsForm *form = new GraphicsForm("Divided nodes");
@@ -598,7 +596,7 @@ void wxDividedShapeControlPoint::OnDragLeft(bool draw, double x, double y, int k
     wxClientDC dc(GetCanvas());
     GetCanvas()->PrepareDC(dc);
 
-    dc.SetLogicalFunction(wxXOR);
+    dc.SetLogicalFunction(OGLRBLF);
     wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT);
     dc.SetPen(dottedPen);
     dc.SetBrush((* wxTRANSPARENT_BRUSH));
@@ -617,7 +615,7 @@ void wxDividedShapeControlPoint::OnBeginDragLeft(double x, double y, int keys, i
     GetCanvas()->PrepareDC(dc);
 
     wxDividedShape *dividedObject = (wxDividedShape *)m_shape;
-    dc.SetLogicalFunction(wxXOR);
+    dc.SetLogicalFunction(OGLRBLF);
     wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT);
     dc.SetPen(dottedPen);
     dc.SetBrush((* wxTRANSPARENT_BRUSH));
@@ -639,7 +637,7 @@ void wxDividedShapeControlPoint::OnEndDragLeft(double x, double y, int keys, int
     wxNode *node = dividedObject->GetRegions().Nth(regionId);
     if (!node)
     return;
-    
+
     wxShapeRegion *thisRegion = (wxShapeRegion *)node->Data();
     wxShapeRegion *nextRegion = NULL; // Region below this one
 
@@ -650,7 +648,7 @@ void wxDividedShapeControlPoint::OnEndDragLeft(double x, double y, int keys, int
     // Find the old top and bottom of this region,
     // and calculate the new proportion for this region
     // if legal.
-  
+
     double currentY = (double)(dividedObject->GetY() - (dividedObject->GetHeight() / 2.0));
     double maxY = (double)(dividedObject->GetY() + (dividedObject->GetHeight() / 2.0));