fixed somebody's poorly done StreamSize-->GetSize transition

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

diff --git a/utils/ogl/src/composit.cpp b/utils/ogl/src/composit.cpp
index 366777b25f873e1ce60d3cc1c8c10f449c7a4fc8..c5118f64e778c92dc435f4c933ff221ca95a30b3 100644 (file)
--- a/utils/ogl/src/composit.cpp
+++ b/utils/ogl/src/composit.cpp
@@ -101,8 +101,8 @@ void wxCompositeShape::OnDraw(wxDC& dc)
   if (m_shadowMode != SHADOW_NONE)
   {
     if (m_shadowBrush)
   if (m_shadowMode != SHADOW_NONE)
   {
     if (m_shadowBrush)

-      dc.SetBrush(m_shadowBrush);
-    dc.SetPen(g_oglTransparentPen);
+      dc.SetBrush(* m_shadowBrush);
+    dc.SetPen(* g_oglTransparentPen);

 
     if (m_cornerRadius != 0.0)
       dc.DrawRoundedRectangle(WXROUND(x1 + m_shadowOffsetX), WXROUND(y1 + m_shadowOffsetY),
 
     if (m_cornerRadius != 0.0)
       dc.DrawRoundedRectangle(WXROUND(x1 + m_shadowOffsetX), WXROUND(y1 + m_shadowOffsetY),


@@ -841,7 +841,7 @@ wxDivisionShape::~wxDivisionShape()
 
 void wxDivisionShape::OnDraw(wxDC& dc)
 {
 
 void wxDivisionShape::OnDraw(wxDC& dc)
 {

-    dc.SetBrush(wxTRANSPARENT_BRUSH);
+    dc.SetBrush(* wxTRANSPARENT_BRUSH);

     dc.SetBackgroundMode(wxTRANSPARENT);
 
     double x1 = (double)(GetX() - (GetWidth()/2.0));
     dc.SetBackgroundMode(wxTRANSPARENT);
 
     double x1 = (double)(GetX() - (GetWidth()/2.0));


@@ -856,18 +856,18 @@ void wxDivisionShape::OnDraw(wxDC& dc)
 
     if (m_leftSide)
     {
 
     if (m_leftSide)
     {

-      dc.SetPen(m_leftSidePen);
+      dc.SetPen(* m_leftSidePen);

       dc.DrawLine(WXROUND(x1), WXROUND(y2), WXROUND(x1), WXROUND(y1));
     }
     if (m_topSide)
     {
       dc.DrawLine(WXROUND(x1), WXROUND(y2), WXROUND(x1), WXROUND(y1));
     }
     if (m_topSide)
     {

-      dc.SetPen(m_topSidePen);
+      dc.SetPen(* m_topSidePen);

       dc.DrawLine(WXROUND(x1), WXROUND(y1), WXROUND(x2), WXROUND(y1));
     }
 
     // For testing purposes, draw a rectangle so we know
     // how big the division is.
       dc.DrawLine(WXROUND(x1), WXROUND(y1), WXROUND(x2), WXROUND(y1));
     }
 
     // For testing purposes, draw a rectangle so we know
     // how big the division is.

-//    SetBrush(wxCYAN_BRUSH);
+//    SetBrush(* wxCYAN_BRUSH);

 //    wxRectangleShape::OnDraw(dc);
 }
 
 //    wxRectangleShape::OnDraw(dc);
 }