X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0a2c03984a3c4d2b9e432db24eb4338ed797b933..3285ee538be44537a0d4e43252db18f5e7362782:/contrib/src/ogl/divided.cpp diff --git a/contrib/src/ogl/divided.cpp b/contrib/src/ogl/divided.cpp index afb71ece6a..d4190100c8 100644 --- a/contrib/src/ogl/divided.cpp +++ b/contrib/src/ogl/divided.cpp @@ -6,7 +6,7 @@ // Created: 12/07/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -24,14 +24,12 @@ #include #endif +#if wxUSE_PROLOGIO #include +#endif + +#include "wx/ogl/ogl.h" -#include -#include -#include -#include -#include -#include class wxDividedShapeControlPoint: public wxControlPoint { @@ -83,7 +81,7 @@ void wxDividedShape::OnDrawContents(wxDC& dc) if (m_pen) dc.SetPen(* m_pen); - if (m_textColour) dc.SetTextForeground(* m_textColour); + dc.SetTextForeground(m_textColour); #ifdef __WXMSW__ // For efficiency, don't do this under X - doesn't make @@ -95,7 +93,7 @@ void wxDividedShape::OnDrawContents(wxDC& dc) if (!formatted) { FormatRegionText(); - formatted = TRUE; + formatted = true; } */ if (GetDisableLabel()) return; @@ -104,12 +102,12 @@ void wxDividedShape::OnDrawContents(wxDC& dc) double yMargin = 2; dc.SetBackgroundMode(wxTRANSPARENT); - wxNode *node = GetRegions().GetFirst(); + wxObjectList::compatibility_iterator node = GetRegions().GetFirst(); while (node) { wxShapeRegion *region = (wxShapeRegion *)node->GetData(); dc.SetFont(* region->GetFont()); - dc.SetTextForeground(* region->GetActualColourObject()); + dc.SetTextForeground(region->GetActualColourObject()); double proportion = region->m_regionProportionY < 0.0 ? defaultProportion : region->m_regionProportionY; @@ -139,7 +137,7 @@ void wxDividedShape::OnDrawContents(wxDC& dc) } } -void wxDividedShape::SetSize(double w, double h, bool recursive) +void wxDividedShape::SetSize(double w, double h, bool WXUNUSED(recursive)) { SetAttachmentSize(w, h); m_width = w; @@ -159,7 +157,7 @@ void wxDividedShape::SetRegionSizes() // double leftX = (double)(m_xpos - (m_width / 2.0)); // double rightX = (double)(m_xpos + (m_width / 2.0)); - wxNode *node = GetRegions().GetFirst(); + wxObjectList::compatibility_iterator node = GetRegions().GetFirst(); while (node) { wxShapeRegion *region = (wxShapeRegion *)node->GetData(); @@ -245,19 +243,9 @@ bool wxDividedShape::GetAttachmentPosition(int attachment, double *x, double *y, // Left or right. else { - int i = 0; - bool isLeft = FALSE; - if (attachment < (n+1)) - { - i = attachment-1; - isLeft = FALSE; - } - else - { - i = (totalNumberAttachments - attachment - 1); - isLeft = TRUE; - } - wxNode *node = GetRegions().Item(i); + bool isLeft = !(attachment < (n+1)); + int i = (isLeft) ? (totalNumberAttachments - attachment - 1) : (attachment-1); + wxObjectList::compatibility_iterator node = GetRegions().Item(i); if (node) { wxShapeRegion *region = (wxShapeRegion *)node->GetData(); @@ -297,10 +285,10 @@ bool wxDividedShape::GetAttachmentPosition(int attachment, double *x, double *y, { *x = m_xpos; *y = m_ypos; - return FALSE; + return false; } } - return TRUE; + return true; } int wxDividedShape::GetNumberOfAttachments() const @@ -310,7 +298,7 @@ int wxDividedShape::GetNumberOfAttachments() const int n = (GetRegions().GetCount() * 2) + 2; int maxN = n - 1; - wxNode *node = m_attachmentPoints.GetFirst(); + wxObjectList::compatibility_iterator node = m_attachmentPoints.GetFirst(); while (node) { wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData(); @@ -329,9 +317,9 @@ bool wxDividedShape::AttachmentIsValid(int attachment) const return wxShape::AttachmentIsValid(attachment); } else if (attachment >= 0) - return TRUE; + return true; else - return FALSE; + return false; } void wxDividedShape::Copy(wxShape& copy) @@ -353,7 +341,7 @@ void wxDividedShape::MakeMandatoryControlPoints() double currentY = (double)(GetY() - (m_height / 2.0)); double maxY = (double)(GetY() + (m_height / 2.0)); - wxNode *node = GetRegions().GetFirst(); + wxObjectList::compatibility_iterator node = GetRegions().GetFirst(); int i = 0; while (node) { @@ -391,14 +379,14 @@ void wxDividedShape::ResetMandatoryControlPoints() double currentY = (double)(GetY() - (m_height / 2.0)); double maxY = (double)(GetY() + (m_height / 2.0)); - wxNode *node = m_controlPoints.GetFirst(); + wxObjectList::compatibility_iterator node = m_controlPoints.GetFirst(); int i = 0; while (node) { wxControlPoint *controlPoint = (wxControlPoint *)node->GetData(); if (controlPoint->IsKindOf(CLASSINFO(wxDividedShapeControlPoint))) { - wxNode *node1 = GetRegions().Item(i); + wxObjectList::compatibility_iterator node1 = GetRegions().Item(i); wxShapeRegion *region = (wxShapeRegion *)node1->GetData(); double proportion = region->m_regionProportionY; @@ -536,7 +524,7 @@ void wxDividedShape::EditRegions() wxEndBusyCursor(); - dialog->Show(TRUE); + dialog->Show(true); node = GetRegions().GetFirst(); i = 0; @@ -591,13 +579,13 @@ wxDividedShapeControlPoint::~wxDividedShapeControlPoint() } // Implement resizing of divided object division -void wxDividedShapeControlPoint::OnDragLeft(bool draw, double x, double y, int keys, int attachment) +void wxDividedShapeControlPoint::OnDragLeft(bool WXUNUSED(draw), double WXUNUSED(x), double y, int WXUNUSED(keys), int WXUNUSED(attachment)) { wxClientDC dc(GetCanvas()); GetCanvas()->PrepareDC(dc); dc.SetLogicalFunction(OGLRBLF); - wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT); + wxPen dottedPen(*wxBLACK, 1, wxDOT); dc.SetPen(dottedPen); dc.SetBrush((* wxTRANSPARENT_BRUSH)); @@ -609,14 +597,14 @@ void wxDividedShapeControlPoint::OnDragLeft(bool draw, double x, double y, int k dc.DrawLine(WXROUND(x1), WXROUND(y1), WXROUND(x2), WXROUND(y2)); } -void wxDividedShapeControlPoint::OnBeginDragLeft(double x, double y, int keys, int attachment) +void wxDividedShapeControlPoint::OnBeginDragLeft(double WXUNUSED(x), double y, int WXUNUSED(keys), int WXUNUSED(attachment)) { wxClientDC dc(GetCanvas()); GetCanvas()->PrepareDC(dc); wxDividedShape *dividedObject = (wxDividedShape *)m_shape; dc.SetLogicalFunction(OGLRBLF); - wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT); + wxPen dottedPen(*wxBLACK, 1, wxDOT); dc.SetPen(dottedPen); dc.SetBrush((* wxTRANSPARENT_BRUSH)); @@ -628,13 +616,13 @@ void wxDividedShapeControlPoint::OnBeginDragLeft(double x, double y, int keys, i m_canvas->CaptureMouse(); } -void wxDividedShapeControlPoint::OnEndDragLeft(double x, double y, int keys, int attachment) +void wxDividedShapeControlPoint::OnEndDragLeft(double WXUNUSED(x), double y, int WXUNUSED(keys), int WXUNUSED(attachment)) { wxClientDC dc(GetCanvas()); GetCanvas()->PrepareDC(dc); wxDividedShape *dividedObject = (wxDividedShape *)m_shape; - wxNode *node = dividedObject->GetRegions().Item(regionId); + wxObjectList::compatibility_iterator node = dividedObject->GetRegions().Item(regionId); if (!node) return; @@ -654,7 +642,6 @@ void wxDividedShapeControlPoint::OnEndDragLeft(double x, double y, int keys, int // Save values double thisRegionTop = 0.0; - double thisRegionBottom = 0.0; double nextRegionBottom = 0.0; node = dividedObject->GetRegions().GetFirst(); @@ -669,7 +656,6 @@ void wxDividedShapeControlPoint::OnEndDragLeft(double x, double y, int keys, int if (region == thisRegion) { thisRegionTop = currentY; - thisRegionBottom = actualY; if (node->GetNext()) nextRegion = (wxShapeRegion *)node->GetNext()->GetData(); } @@ -706,9 +692,8 @@ void wxDividedShapeControlPoint::OnEndDragLeft(double x, double y, int keys, int wxShapeRegion *region = (wxShapeRegion *)node->GetData(); if (region->GetText()) { - wxChar *s = copystring(region->GetText()); - dividedObject->FormatText(dc, s, i); - delete[] s; + wxString s(region->GetText()); + dividedObject->FormatText(dc, s.c_str(), i); } node = node->GetNext(); i++;