small fixes

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

diff --git a/utils/ogl/src/divided.cpp b/utils/ogl/src/divided.cpp
index 68fa6ca64618c75d38bb3acaa3be7a58242afda0..f178550d5cee1788a3b7e3af036725932bb6ebe7 100644 (file)
--- a/utils/ogl/src/divided.cpp
+++ b/utils/ogl/src/divided.cpp
@@ -81,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);
 
@@ -108,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 =
@@ -128,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));
       }
     }
@@ -151,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));
@@ -440,7 +440,7 @@ void wxDividedShape::EditRegions()
 #if 0
   if (GetRegions().Number() < 2)
     return;
-    
+
   wxBeginBusyCursor();
 
   GraphicsForm *form = new GraphicsForm("Divided nodes");
@@ -596,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));
@@ -615,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));
@@ -637,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
 
@@ -648,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));