some fixes and code regeneration

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

diff --git a/utils/ogl/src/basic.cpp b/utils/ogl/src/basic.cpp
index 6961d4585200cc8305ca5e4197a8526ca7d1f343..4fd5bc25cf4b9ef73c364e9e9de5dea455dcec84 100644 (file)
--- a/utils/ogl/src/basic.cpp
+++ b/utils/ogl/src/basic.cpp
@@ -24,9 +24,7 @@
 #include <wx/wx.h>
 #endif
 
 #include <wx/wx.h>
 #endif
 

-#ifdef PROLOGIO

 #include <wx/wxexpr.h>
 #include <wx/wxexpr.h>

-#endif

 
 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 
 #if wxUSE_IOSTREAMH
 #include <iostream.h>


@@ -299,11 +297,11 @@ wxShape::wxShape(wxShapeCanvas *can)
   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;

-  m_shadowOffsetX = 6.0;
-  m_shadowOffsetY = 6.0;
+  m_shadowOffsetX = 6;
+  m_shadowOffsetY = 6;

   m_shadowBrush = wxBLACK_BRUSH;
   m_shadowBrush = wxBLACK_BRUSH;

-  m_textMarginX = 5.0;
-  m_textMarginY = 5.0;
+  m_textMarginX = 5;
+  m_textMarginY = 5;

   m_regionName = "0";
   m_centreResize = TRUE;
   m_maintainAspectRatio = FALSE;
   m_regionName = "0";
   m_centreResize = TRUE;
   m_maintainAspectRatio = FALSE;


@@ -604,10 +602,10 @@ void wxShape::FormatText(wxDC& dc, const wxString& s, int i)
   wxNode *node = m_regions.Nth(i);
   if (!node)
     return;
   wxNode *node = m_regions.Nth(i);
   if (!node)
     return;

-    
+

   wxShapeRegion *region = (wxShapeRegion *)node->Data();
   region->SetText(s);
   wxShapeRegion *region = (wxShapeRegion *)node->Data();
   region->SetText(s);

-  dc.SetFont(region->GetFont());
+  dc.SetFont(* region->GetFont());

 
   region->GetSize(&w, &h);
 
 
   region->GetSize(&w, &h);
 


@@ -711,7 +709,7 @@ wxShape *wxShape::GetTopAncestor()
 {
   if (!GetParent())
     return this;
 {
   if (!GetParent())
     return this;

-    
+

   if (GetParent()->IsKindOf(CLASSINFO(wxDivisionShape)))
     return this;
   else return GetParent()->GetTopAncestor();
   if (GetParent()->IsKindOf(CLASSINFO(wxDivisionShape)))
     return this;
   else return GetParent()->GetTopAncestor();


@@ -886,7 +884,7 @@ void wxShape::FindRegionNames(wxStringList& list)
 void wxShape::AssignNewIds()
 {
 //  if (m_id == 0)
 void wxShape::AssignNewIds()
 {
 //  if (m_id == 0)

-  m_id = NewId();
+  m_id = wxNewId();

   wxNode *node = m_children.First();
   while (node)
   {
   wxNode *node = m_children.First();
   while (node)
   {


@@ -921,10 +919,10 @@ void wxShape::OnDrawContents(wxDC& dc)
   GetBoundingBoxMin(&bound_x, &bound_y);
     if (m_regions.Number() < 1) return;
 
   GetBoundingBoxMin(&bound_x, &bound_y);
     if (m_regions.Number() < 1) return;
 

-    if (m_pen) dc.SetPen(m_pen);
+    if (m_pen) dc.SetPen(* m_pen);

 
     wxShapeRegion *region = (wxShapeRegion *)m_regions.First()->Data();
 
     wxShapeRegion *region = (wxShapeRegion *)m_regions.First()->Data();

-    if (region->GetFont()) dc.SetFont(region->GetFont());
+    if (region->GetFont()) dc.SetFont(* region->GetFont());

 
     dc.SetTextForeground(* (region->GetActualColourObject()));
     dc.SetBackgroundMode(wxTRANSPARENT);
 
     dc.SetTextForeground(* (region->GetActualColourObject()));
     dc.SetBackgroundMode(wxTRANSPARENT);


@@ -990,8 +988,8 @@ void wxShape::OnEraseContents(wxDC& dc)
     if (m_pen)
       penWidth = m_pen->GetWidth();
 
     if (m_pen)
       penWidth = m_pen->GetWidth();
 

-    dc.SetPen(g_oglWhiteBackgroundPen);
-    dc.SetBrush(g_oglWhiteBackgroundBrush);
+    dc.SetPen(* g_oglWhiteBackgroundPen);
+    dc.SetBrush(* g_oglWhiteBackgroundBrush);

     dc.DrawRectangle(WXROUND(topLeftX - penWidth), WXROUND(topLeftY - penWidth),
                       WXROUND(maxX + penWidth*2.0 + 4.0), WXROUND(maxY + penWidth*2.0 + 4.0));
 }
     dc.DrawRectangle(WXROUND(topLeftX - penWidth), WXROUND(topLeftY - penWidth),
                       WXROUND(maxX + penWidth*2.0 + 4.0), WXROUND(maxY + penWidth*2.0 + 4.0));
 }


@@ -1184,7 +1182,7 @@ void wxShape::ApplyAttachmentOrdering(wxList& linesToSort)
 {
   // This is a temporary store of all the lines.
   wxList linesStore;
 {
   // This is a temporary store of all the lines.
   wxList linesStore;

-  
+

   wxNode *node = m_lines.First();
   while (node)
   {
   wxNode *node = m_lines.First();
   while (node)
   {


@@ -1226,7 +1224,7 @@ void wxShape::SortLines(int attachment, wxList& linesToSort)
   // This is a temporary store of all the lines at this attachment
   // point. We'll tick them off as we've processed them.
   wxList linesAtThisAttachment;
   // This is a temporary store of all the lines at this attachment
   // point. We'll tick them off as we've processed them.
   wxList linesAtThisAttachment;

-  
+

   wxNode *node = m_lines.First();
   while (node)
   {
   wxNode *node = m_lines.First();
   while (node)
   {


@@ -1319,7 +1317,7 @@ void wxShape::OnDragLeft(bool draw, double x, double y, int keys, int attachment
   wxClientDC dc(GetCanvas());
   GetCanvas()->PrepareDC(dc);
 
   wxClientDC dc(GetCanvas());
   GetCanvas()->PrepareDC(dc);
 

-  dc.SetLogicalFunction(wxXOR);
+  dc.SetLogicalFunction(OGLRBLF);

 
   wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT);
   dc.SetPen(dottedPen);
 
   wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT);
   dc.SetPen(dottedPen);


@@ -1364,7 +1362,7 @@ void wxShape::OnBeginDragLeft(double x, double y, int keys, int attachment)
   yy = y + DragOffsetY;
   m_canvas->Snap(&xx, &yy);
 //  m_xpos = xx; m_ypos = yy;
   yy = y + DragOffsetY;
   m_canvas->Snap(&xx, &yy);
 //  m_xpos = xx; m_ypos = yy;

-  dc.SetLogicalFunction(wxXOR);
+  dc.SetLogicalFunction(OGLRBLF);

 
   wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT);
   dc.SetPen(dottedPen);
 
   wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT);
   dc.SetPen(dottedPen);


@@ -1532,7 +1530,7 @@ void wxShape::Flash()
         wxClientDC dc(GetCanvas());
         GetCanvas()->PrepareDC(dc);
 
         wxClientDC dc(GetCanvas());
         GetCanvas()->PrepareDC(dc);
 

-        dc.SetLogicalFunction(wxXOR);
+        dc.SetLogicalFunction(OGLRBLF);

         Draw(dc);
         dc.SetLogicalFunction(wxCOPY);
         Draw(dc);
         Draw(dc);
         dc.SetLogicalFunction(wxCOPY);
         Draw(dc);


@@ -1732,7 +1730,7 @@ void wxShape::WriteAttributes(wxExpr *clause)
     }
     else if (brushColour != "WHITE")
       clause->AddAttributeValueString("brush_colour", brushColour);
     }
     else if (brushColour != "WHITE")
       clause->AddAttributeValueString("brush_colour", brushColour);

-    
+

     if (m_brush->GetStyle() != wxSOLID)
       clause->AddAttributeValue("brush_style", (long)m_brush->GetStyle());
   }
     if (m_brush->GetStyle() != wxSOLID)
       clause->AddAttributeValue("brush_style", (long)m_brush->GetStyle());
   }


@@ -1827,8 +1825,8 @@ void wxShape::WriteRegions(wxExpr *clause)
     // region1 = (regionName regionText x y width height minWidth minHeight proportionX proportionY
     //            formatMode fontSize fontFamily fontStyle fontWeight textColour)
     wxExpr *regionExpr = new wxExpr(wxExprList);
     // region1 = (regionName regionText x y width height minWidth minHeight proportionX proportionY
     //            formatMode fontSize fontFamily fontStyle fontWeight textColour)
     wxExpr *regionExpr = new wxExpr(wxExprList);

-    regionExpr->Append(new wxExpr(wxExprString, (region->m_regionName ? region->m_regionName : "")));
-    regionExpr->Append(new wxExpr(wxExprString, (region->m_regionText ? region->m_regionText : "")));
+    regionExpr->Append(new wxExpr(wxExprString, region->m_regionName));
+    regionExpr->Append(new wxExpr(wxExprString, region->m_regionText));

 
     regionExpr->Append(new wxExpr(region->m_x));
     regionExpr->Append(new wxExpr(region->m_y));
 
     regionExpr->Append(new wxExpr(region->m_x));
     regionExpr->Append(new wxExpr(region->m_y));


@@ -1846,10 +1844,10 @@ void wxShape::WriteRegions(wxExpr *clause)
     regionExpr->Append(new wxExpr((long)(region->m_font ? region->m_font->GetFamily() : wxDEFAULT)));
     regionExpr->Append(new wxExpr((long)(region->m_font ? region->m_font->GetStyle() : wxDEFAULT)));
     regionExpr->Append(new wxExpr((long)(region->m_font ? region->m_font->GetWeight() : wxNORMAL)));
     regionExpr->Append(new wxExpr((long)(region->m_font ? region->m_font->GetFamily() : wxDEFAULT)));
     regionExpr->Append(new wxExpr((long)(region->m_font ? region->m_font->GetStyle() : wxDEFAULT)));
     regionExpr->Append(new wxExpr((long)(region->m_font ? region->m_font->GetWeight() : wxNORMAL)));

-    regionExpr->Append(new wxExpr(wxExprString, region->m_textColour ? region->m_textColour : "BLACK"));
+    regionExpr->Append(new wxExpr(wxExprString, region->m_textColour));

 
     // New members for pen colour/style
 
     // New members for pen colour/style

-    regionExpr->Append(new wxExpr(wxExprString, region->m_penColour ? region->m_penColour : "BLACK"));
+    regionExpr->Append(new wxExpr(wxExprString, region->m_penColour));

     regionExpr->Append(new wxExpr((long)region->m_penStyle));
 
     // Formatted text:
     regionExpr->Append(new wxExpr((long)region->m_penStyle));
 
     // Formatted text:


@@ -1880,7 +1878,7 @@ void wxShape::WriteRegions(wxExpr *clause)
 void wxShape::ReadAttributes(wxExpr *clause)
 {
   clause->GetAttributeValue("id", m_id);
 void wxShape::ReadAttributes(wxExpr *clause)
 {
   clause->GetAttributeValue("id", m_id);

-  RegisterId(m_id);
+  wxRegisterId(m_id);

 
   clause->GetAttributeValue("x", m_xpos);
   clause->GetAttributeValue("y", m_ypos);
 
   clause->GetAttributeValue("x", m_xpos);
   clause->GetAttributeValue("y", m_ypos);


@@ -1909,8 +1907,8 @@ void wxShape::ReadAttributes(wxExpr *clause)
       else if (string_expr->Type() == wxExprList)
       {
         wxExpr *first = string_expr->value.first;
       else if (string_expr->Type() == wxExprList)
       {
         wxExpr *first = string_expr->value.first;

-        wxExpr *second = first ? first->next : NULL;
-        wxExpr *third = second ? second->next : NULL;
+        wxExpr *second = first ? first->next : (wxExpr*) NULL;
+        wxExpr *third = second ? second->next : (wxExpr*) NULL;

 
         if (first && second && third &&
             (first->Type() == wxExprReal || first->Type() == wxExprInteger) &&
 
         if (first && second && third &&
             (first->Type() == wxExprReal || first->Type() == wxExprInteger) &&


@@ -2009,7 +2007,7 @@ void wxShape::ReadAttributes(wxExpr *clause)
   if (brush_string == "")
     brush_string = "WHITE";
 
   if (brush_string == "")
     brush_string = "WHITE";
 

-  if (pen_string[0] == '#')
+  if (pen_string.GetChar(0) == '#')

   {
     wxColour col(oglHexToColour(pen_string.After('#')));
     m_pen = wxThePenList->FindOrCreatePen(col, pen_width, pen_style);
   {
     wxColour col(oglHexToColour(pen_string.After('#')));
     m_pen = wxThePenList->FindOrCreatePen(col, pen_width, pen_style);


@@ -2020,7 +2018,7 @@ void wxShape::ReadAttributes(wxExpr *clause)
   if (!m_pen)
     m_pen = wxBLACK_PEN;
 
   if (!m_pen)
     m_pen = wxBLACK_PEN;
 

-  if (brush_string[0] == '#')
+  if (brush_string.GetChar(0) == '#')

   {
     wxColour col(oglHexToColour(brush_string.After('#')));
     m_brush = wxTheBrushList->FindOrCreateBrush(col, brush_style);
   {
     wxColour col(oglHexToColour(brush_string.After('#')));
     m_brush = wxTheBrushList->FindOrCreateBrush(col, brush_style);


@@ -2078,7 +2076,7 @@ void wxShape::ReadRegions(wxExpr *clause)
 
   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))
+  while ((regionExpr = clause->AttributeValue(regionNameBuf)))

   {
     /*
      * Get the region information
   {
     /*
      * Get the region information


@@ -2133,7 +2131,7 @@ void wxShape::ReadRegions(wxExpr *clause)
 
       width = widthExpr->RealValue();
       height = heightExpr->RealValue();
 
       width = widthExpr->RealValue();
       height = heightExpr->RealValue();

-      
+

       minWidth = minWidthExpr->RealValue();
       minHeight = minHeightExpr->RealValue();
 
       minWidth = minWidthExpr->RealValue();
       minHeight = minHeightExpr->RealValue();
 


@@ -2202,8 +2200,8 @@ void wxShape::ReadRegions(wxExpr *clause)
         else if (string_expr->Type() == wxExprList)
         {
           wxExpr *first = string_expr->value.first;
         else if (string_expr->Type() == wxExprList)
         {
           wxExpr *first = string_expr->value.first;

-          wxExpr *second = first ? first->next : NULL;
-          wxExpr *third = second ? second->next : NULL;
+          wxExpr *second = first ? first->next : (wxExpr*) NULL;
+          wxExpr *third = second ? second->next : (wxExpr*) NULL;

 
           if (first && second && third &&
               (first->Type() == wxExprReal || first->Type() == wxExprInteger) &&
 
           if (first && second && third &&
               (first->Type() == wxExprReal || first->Type() == wxExprInteger) &&


@@ -2394,42 +2392,42 @@ void wxShape::MakeControlPoints()
   double left = (double)(- (widthMin / 2.0));
   double right = (double)(widthMin / 2.0 + (maxX - minX));
 
   double left = (double)(- (widthMin / 2.0));
   double right = (double)(widthMin / 2.0 + (maxX - minX));
 

-  wxControlPoint *control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, left, top, 
+  wxControlPoint *control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, left, top,

                                            CONTROL_POINT_DIAGONAL);
   m_canvas->AddShape(control);
   m_controlPoints.Append(control);
 
                                            CONTROL_POINT_DIAGONAL);
   m_canvas->AddShape(control);
   m_controlPoints.Append(control);
 

-  control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, 0, top, 
+  control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, 0, top,

                                            CONTROL_POINT_VERTICAL);
   m_canvas->AddShape(control);
   m_controlPoints.Append(control);
 
                                            CONTROL_POINT_VERTICAL);
   m_canvas->AddShape(control);
   m_controlPoints.Append(control);
 

-  control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, right, top, 
+  control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, right, top,

                                            CONTROL_POINT_DIAGONAL);
   m_canvas->AddShape(control);
   m_controlPoints.Append(control);
 
                                            CONTROL_POINT_DIAGONAL);
   m_canvas->AddShape(control);
   m_controlPoints.Append(control);
 

-  control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, right, 0, 
+  control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, right, 0,

                                            CONTROL_POINT_HORIZONTAL);
   m_canvas->AddShape(control);
   m_controlPoints.Append(control);
 
                                            CONTROL_POINT_HORIZONTAL);
   m_canvas->AddShape(control);
   m_controlPoints.Append(control);
 

-  control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, right, bottom, 
+  control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, right, bottom,

                                            CONTROL_POINT_DIAGONAL);
   m_canvas->AddShape(control);
   m_controlPoints.Append(control);
 
                                            CONTROL_POINT_DIAGONAL);
   m_canvas->AddShape(control);
   m_controlPoints.Append(control);
 

-  control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, 0, bottom, 
+  control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, 0, bottom,

                                            CONTROL_POINT_VERTICAL);
   m_canvas->AddShape(control);
   m_controlPoints.Append(control);
 
                                            CONTROL_POINT_VERTICAL);
   m_canvas->AddShape(control);
   m_controlPoints.Append(control);
 

-  control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, left, bottom, 
+  control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, left, bottom,

                                            CONTROL_POINT_DIAGONAL);
   m_canvas->AddShape(control);
   m_controlPoints.Append(control);
 
                                            CONTROL_POINT_DIAGONAL);
   m_canvas->AddShape(control);
   m_controlPoints.Append(control);
 

-  control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, left, 0, 
+  control = new wxControlPoint(m_canvas, this, CONTROL_POINT_SIZE, left, 0,

                                            CONTROL_POINT_HORIZONTAL);
   m_canvas->AddShape(control);
   m_controlPoints.Append(control);
                                            CONTROL_POINT_HORIZONTAL);
   m_canvas->AddShape(control);
   m_controlPoints.Append(control);


@@ -2536,9 +2534,9 @@ void wxShape::OnDrawControlPoints(wxDC& dc)
 {
   if (!m_drawHandles)
     return;
 {
   if (!m_drawHandles)
     return;

-    
-  dc.SetBrush(wxBLACK_BRUSH);
-  dc.SetPen(wxBLACK_PEN);
+
+  dc.SetBrush(* wxBLACK_BRUSH);
+  dc.SetPen(* wxBLACK_PEN);

 
   wxNode *node = m_controlPoints.First();
   while (node)
 
   wxNode *node = m_controlPoints.First();
   while (node)


@@ -2675,7 +2673,7 @@ bool wxShape::AttachmentIsValid(int attachment) const
   return FALSE;
 }
 
   return FALSE;
 }
 

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

                                          int nth, int no_arcs, wxLineShape *line)
 {
     if (m_attachmentMode == ATTACHMENT_MODE_NONE)
                                          int nth, int no_arcs, wxLineShape *line)
 {
     if (m_attachmentMode == ATTACHMENT_MODE_NONE)