#include <wx/wx.h>
#endif
-#include <wx/wxexpr.h>
+#if wxUSE_PROLOGIO
+#include <wx/deprecated/wxexpr.h>
+#endif
+
+#include "wx/ogl/ogl.h"
-#include <wx/ogl/basic.h>
-#include <wx/ogl/basicp.h>
-#include <wx/ogl/canvas.h>
-#include <wx/ogl/divided.h>
-#include <wx/ogl/lines.h>
-#include <wx/ogl/misc.h>
class wxDividedShapeControlPoint: public wxControlPoint
{
void wxDividedShape::OnDrawContents(wxDC& dc)
{
- double defaultProportion = (double)(GetRegions().Number() > 0 ? (1.0/((double)(GetRegions().Number()))) : 0.0);
+ double defaultProportion = (double)(GetRegions().GetCount() > 0 ? (1.0/((double)(GetRegions().GetCount()))) : 0.0);
double currentY = (double)(m_ypos - (m_height / 2.0));
double maxY = (double)(m_ypos + (m_height / 2.0));
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
double yMargin = 2;
dc.SetBackgroundMode(wxTRANSPARENT);
- wxNode *node = GetRegions().First();
+ wxNode *node = GetRegions().GetFirst();
while (node)
{
- wxShapeRegion *region = (wxShapeRegion *)node->Data();
+ 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;
oglDrawFormattedText(dc, ®ion->m_formattedText,
(double)(centreX), (double)(centreY), (double)(m_width-2*xMargin), (double)(actualY - currentY - 2*yMargin),
region->m_formatMode);
- if ((y <= maxY) && (node->Next()))
+ if ((y <= maxY) && (node->GetNext()))
{
wxPen *regionPen = region->GetActualPen();
if (regionPen)
currentY = actualY;
- node = node->Next();
+ node = node->GetNext();
}
}
-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;
void wxDividedShape::SetRegionSizes()
{
- if (GetRegions().Number() == 0)
+ if (GetRegions().GetCount() == 0)
return;
- double defaultProportion = (double)(GetRegions().Number() > 0 ? (1.0/((double)(GetRegions().Number()))) : 0.0);
+ double defaultProportion = (double)(GetRegions().GetCount() > 0 ? (1.0/((double)(GetRegions().GetCount()))) : 0.0);
double currentY = (double)(m_ypos - (m_height / 2.0));
double maxY = (double)(m_ypos + (m_height / 2.0));
// double leftX = (double)(m_xpos - (m_width / 2.0));
// double rightX = (double)(m_xpos + (m_width / 2.0));
- wxNode *node = GetRegions().First();
+ wxNode *node = GetRegions().GetFirst();
while (node)
{
- wxShapeRegion *region = (wxShapeRegion *)node->Data();
+ wxShapeRegion *region = (wxShapeRegion *)node->GetData();
double proportion =
region->m_regionProportionY <= 0.0 ? defaultProportion : region->m_regionProportionY;
region->SetSize(m_width, sizeY);
region->SetPosition(0.0, (double)(centreY - m_ypos));
currentY = actualY;
- node = node->Next();
+ node = node->GetNext();
}
}
bool wxDividedShape::GetAttachmentPosition(int attachment, double *x, double *y, int nth, int no_arcs,
wxLineShape *line)
{
- int totalNumberAttachments = (GetRegions().Number() * 2) + 2;
+ int totalNumberAttachments = (GetRegions().GetCount() * 2) + 2;
if ((GetAttachmentMode() == ATTACHMENT_MODE_NONE) || (attachment >= totalNumberAttachments))
{
return wxShape::GetAttachmentPosition(attachment, x, y, nth, no_arcs);
}
- int n = GetRegions().Number();
+ int n = GetRegions().GetCount();
bool isEnd = (line && line->IsEnd(this));
double left = (double)(m_xpos - m_width/2.0);
// 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().Nth(i);
+ bool isLeft = !(attachment < (n+1));
+ int i = (isLeft) ? (totalNumberAttachments - attachment - 1) : (attachment-1);
+ wxNode *node = GetRegions().Item(i);
if (node)
{
- wxShapeRegion *region = (wxShapeRegion *)node->Data();
+ wxShapeRegion *region = (wxShapeRegion *)node->GetData();
if (isLeft)
*x = left;
{
// There are two attachments for each region (left and right),
// plus one on the top and one on the bottom.
- int n = (GetRegions().Number() * 2) + 2;
+ int n = (GetRegions().GetCount() * 2) + 2;
int maxN = n - 1;
- wxNode *node = m_attachmentPoints.First();
+ wxNode *node = m_attachmentPoints.GetFirst();
while (node)
{
- wxAttachmentPoint *point = (wxAttachmentPoint *)node->Data();
+ wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();
if (point->m_id > maxN)
maxN = point->m_id;
- node = node->Next();
+ node = node->GetNext();
}
return maxN + 1;
}
-bool wxDividedShape::AttachmentIsValid(int attachment)
+bool wxDividedShape::AttachmentIsValid(int attachment) const
{
- int totalNumberAttachments = (GetRegions().Number() * 2) + 2;
+ int totalNumberAttachments = (GetRegions().GetCount() * 2) + 2;
if (attachment >= totalNumberAttachments)
{
return wxShape::AttachmentIsValid(attachment);
double currentY = (double)(GetY() - (m_height / 2.0));
double maxY = (double)(GetY() + (m_height / 2.0));
- wxNode *node = GetRegions().First();
+ wxNode *node = GetRegions().GetFirst();
int i = 0;
while (node)
{
- wxShapeRegion *region = (wxShapeRegion *)node->Data();
+ wxShapeRegion *region = (wxShapeRegion *)node->GetData();
double proportion = region->m_regionProportionY;
double y = currentY + m_height*proportion;
double actualY = (double)(maxY < y ? maxY : y);
- if (node->Next())
+ if (node->GetNext())
{
wxDividedShapeControlPoint *controlPoint =
new wxDividedShapeControlPoint(m_canvas, this, i, CONTROL_POINT_SIZE, 0.0, (double)(actualY - GetY()), 0);
}
currentY = actualY;
i ++;
- node = node->Next();
+ node = node->GetNext();
}
}
void wxDividedShape::ResetControlPoints()
{
// May only have the region handles, (n - 1) of them.
- if (m_controlPoints.Number() > (GetRegions().Number() - 1))
+ if (m_controlPoints.GetCount() > (GetRegions().GetCount() - 1))
wxRectangleShape::ResetControlPoints();
ResetMandatoryControlPoints();
double currentY = (double)(GetY() - (m_height / 2.0));
double maxY = (double)(GetY() + (m_height / 2.0));
- wxNode *node = m_controlPoints.First();
+ wxNode *node = m_controlPoints.GetFirst();
int i = 0;
while (node)
{
- wxControlPoint *controlPoint = (wxControlPoint *)node->Data();
+ wxControlPoint *controlPoint = (wxControlPoint *)node->GetData();
if (controlPoint->IsKindOf(CLASSINFO(wxDividedShapeControlPoint)))
{
- wxNode *node1 = GetRegions().Nth(i);
- wxShapeRegion *region = (wxShapeRegion *)node1->Data();
+ wxNode *node1 = GetRegions().Item(i);
+ wxShapeRegion *region = (wxShapeRegion *)node1->GetData();
double proportion = region->m_regionProportionY;
currentY = actualY;
i ++;
}
- node = node->Next();
+ node = node->GetNext();
}
}
// TODO
#if 0
- if (GetRegions().Number() < 2)
+ if (GetRegions().GetCount() < 2)
return;
wxBeginBusyCursor();
GraphicsForm *form = new GraphicsForm("Divided nodes");
// Need an array to store all the style strings,
// since they need to be converted to integers
- char **styleStrings = new char *[GetRegions().Number()];
- for (int j = 0; j < GetRegions().Number(); j++)
+ char **styleStrings = new char *[GetRegions().GetCount()];
+ for (int j = 0; j < GetRegions().GetCount(); j++)
styleStrings[j] = NULL;
int i = 0;
- wxNode *node = GetRegions().First();
- while (node && node->Next())
+ wxNode *node = GetRegions().GetFirst();
+ while (node && node->GetNext())
{
- wxShapeRegion *region = (wxShapeRegion *)node->Data();
+ wxShapeRegion *region = (wxShapeRegion *)node->GetData();
char buf[50];
sprintf(buf, "Region %d", (i+1));
form->Add(wxMakeFormMessage(buf));
"Dot Dash" ,
NULL),
NULL), NULL, wxVERTICAL, 100));
- node = node->Next();
+ node = node->GetNext();
i ++;
- if (node && node->Next())
+ if (node && node->GetNext())
form->Add(wxMakeFormNewLine());
}
wxDialogBox *dialog = new wxDialogBox(m_canvas->GetParent(), "Divided object properties", 10, 10, 500, 500);
dialog->Show(TRUE);
- node = GetRegions().First();
+ node = GetRegions().GetFirst();
i = 0;
while (node)
{
- wxShapeRegion *region = (wxShapeRegion *)node->Data();
+ wxShapeRegion *region = (wxShapeRegion *)node->GetData();
if (styleStrings[i])
{
delete[] styleStrings[i];
}
region->m_actualPenObject = NULL;
- node = node->Next();
+ node = node->GetNext();
i ++;
}
delete[] styleStrings;
}
// 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.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);
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().Nth(regionId);
+ wxNode *node = dividedObject->GetRegions().Item(regionId);
if (!node)
return;
- wxShapeRegion *thisRegion = (wxShapeRegion *)node->Data();
+ wxShapeRegion *thisRegion = (wxShapeRegion *)node->GetData();
wxShapeRegion *nextRegion = NULL; // Region below this one
dc.SetLogicalFunction(wxCOPY);
// Save values
double thisRegionTop = 0.0;
+ #if 0
+ // this variable is not readed later
double thisRegionBottom = 0.0;
+ #endif
double nextRegionBottom = 0.0;
- node = dividedObject->GetRegions().First();
+ node = dividedObject->GetRegions().GetFirst();
while (node)
{
- wxShapeRegion *region = (wxShapeRegion *)node->Data();
+ wxShapeRegion *region = (wxShapeRegion *)node->GetData();
double proportion = region->m_regionProportionY;
double yy = currentY + (dividedObject->GetHeight()*proportion);
if (region == thisRegion)
{
thisRegionTop = currentY;
+ #if 0
+ // no need for assignment if value is not used later
thisRegionBottom = actualY;
- if (node->Next())
- nextRegion = (wxShapeRegion *)node->Next()->Data();
+ #endif
+ if (node->GetNext())
+ nextRegion = (wxShapeRegion *)node->GetNext()->GetData();
}
if (region == nextRegion)
{
}
currentY = actualY;
- node = node->Next();
+ node = node->GetNext();
}
if (!nextRegion)
return;
// Now reformat text
int i = 0;
- node = dividedObject->GetRegions().First();
+ node = dividedObject->GetRegions().GetFirst();
while (node)
{
- wxShapeRegion *region = (wxShapeRegion *)node->Data();
+ wxShapeRegion *region = (wxShapeRegion *)node->GetData();
if (region->GetText())
{
wxChar *s = copystring(region->GetText());
dividedObject->FormatText(dc, s, i);
delete[] s;
}
- node = node->Next();
+ node = node->GetNext();
i++;
}
dividedObject->SetRegionSizes();
projects / wxWidgets.git / blobdiff