Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxUSE_STL fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-07-23 18:04:12 +00:00
parent 4b7ded8bad
commit 5e0dbc8dd9
11 changed files with 42 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/samples/ogl/ogledit/view.cpp
View File

@@ -176,19 +176,17 @@ bool DiagramView::OnClose(bool WXUNUSED(deleteWindow))
wxShape *DiagramView::FindSelectedShape(void)
{
DiagramDocument *doc = (DiagramDocument *)GetDocument();
wxShape *theShape = NULL;
wxObjectList::compatibility_iterator node = doc->GetDiagram()->GetShapeList()->GetFirst();
while (node)
{
wxShape *eachShape = (wxShape *)node->GetData();
if ((eachShape->GetParent() == NULL) && eachShape->Selected())
{
theShape = eachShape;
node = NULL;
return eachShape;
}
else node = node->GetNext();
}
return theShape;
return NULL;
}
void DiagramView::OnCut(wxCommandEvent& WXUNUSED(event))

4
contrib/samples/ogl/studio/csprint.cpp
View File

@@ -70,7 +70,7 @@ bool wxDiagramClipboard::DoCopy(wxDiagram* diagramFrom, wxDiagram* diagramTo, bo
// First copy all node shapes.
wxList* shapeList = diagramFrom->GetShapeList();
wxNode* node = shapeList->GetFirst();
wxObjectList::compatibility_iterator node = shapeList->GetFirst();
while (node)
{
wxShape* shape = (wxShape*) node->GetData();
@@ -137,7 +137,7 @@ bool wxDiagramClipboard::DoCopy(wxDiagram* diagramFrom, wxDiagram* diagramTo, bo
// Make a list of all the new lines, in the same order as the old lines.
// Then apply the list of new lines to the shape.
wxList newLines;
wxNode* lineNode = shape->GetLines().GetFirst();
wxObjectList::compatibility_iterator lineNode = shape->GetLines().GetFirst();
while (lineNode)
{
wxLineShape* lineShape = (wxLineShape*) lineNode->GetData();

4
contrib/samples/ogl/studio/dialogs.cpp
View File

@@ -205,7 +205,7 @@ bool csSettingsDialog::TransferDataFromWindow()
}
// Apply settings to all open diagram documents
wxNode* node = wxGetApp().GetDocManager()->GetDocuments().GetFirst();
wxObjectList::compatibility_iterator node = wxGetApp().GetDocManager()->GetDocuments().GetFirst();
while (node)
{
wxDocument* doc = (wxDocument*) node->GetData();
@@ -365,7 +365,7 @@ void csShapePropertiesDialog::SetDefaults()
if (!m_attributeDialog)
return;
wxWindowListNode* node = m_attributeDialog->GetChildren().GetFirst();
wxWindowList::compatibility_iterator node = m_attributeDialog->GetChildren().GetFirst();
while (node)
{
wxWindow* child = (wxWindow*) node->GetData();

20
contrib/samples/ogl/studio/view.cpp
View File

@@ -198,19 +198,17 @@ void csDiagramView::OnSelectAll(wxCommandEvent& WXUNUSED(event))
wxShape *csDiagramView::FindFirstSelectedShape(void)
{
csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
wxShape *theShape = NULL;
wxObjectList::compatibility_iterator node = doc->GetDiagram()->GetShapeList()->GetFirst();
while (node)
{
wxShape *eachShape = (wxShape *)node->GetData();
if ((eachShape->GetParent() == NULL) && !eachShape->IsKindOf(CLASSINFO(wxLabelShape)) && eachShape->Selected())
{
theShape = eachShape;
node = NULL;
return eachShape;
}
else node = node->GetNext();
}
return theShape;
return NULL;
}
void csDiagramView::FindSelectedShapes(wxList& selections, wxClassInfo* toFind)
@@ -579,7 +577,7 @@ void csDiagramView::OnToggleArrowTool(wxCommandEvent& WXUNUSED(event))
{
csDiagramCommand* cmd = new csDiagramCommand(stateName, doc);
wxNode* node = selections.GetFirst();
wxObjectList::compatibility_iterator node = selections.GetFirst();
while (node)
{
wxLineShape *theShape = (wxLineShape*) node->GetData();
@@ -634,7 +632,7 @@ void csDiagramView::ReflectPointSize(int pointSize)
void csDiagramView::ReflectArrowState(wxLineShape* lineShape)
{
bool haveArrow = false;
wxNode *node = lineShape->GetArrows().GetFirst();
wxObjectList::compatibility_iterator node = lineShape->GetArrows().GetFirst();
while (node)
{
wxArrowHead *arrow = (wxArrowHead *)node->GetData();
@@ -651,7 +649,7 @@ void csDiagramView::OnAlign(wxCommandEvent& event)
// Make a copy of the selections, keeping only those shapes
// that are top-level non-line shapes.
wxList selections;
wxNode* node = GetSelectionList().GetFirst();
wxObjectList::compatibility_iterator node = GetSelectionList().GetFirst();
while (node)
{
wxShape* shape = (wxShape*) node->GetData();
@@ -751,7 +749,7 @@ void csDiagramView::OnNewLinePoint(wxCommandEvent& WXUNUSED(event))
csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
csDiagramCommand* cmd = new csDiagramCommand(_T("New line point"), doc);
wxNode* node = m_selections.GetFirst();
wxObjectList::compatibility_iterator node = m_selections.GetFirst();
while (node)
{
wxShape* shape = (wxShape*) node->GetData();
@@ -772,7 +770,7 @@ void csDiagramView::OnCutLinePoint(wxCommandEvent& WXUNUSED(event))
csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
csDiagramCommand* cmd = new csDiagramCommand(_T("Cut line point"), doc);
wxNode* node = m_selections.GetFirst();
wxObjectList::compatibility_iterator node = m_selections.GetFirst();
while (node)
{
wxShape* shape = (wxShape*) node->GetData();
@@ -793,7 +791,7 @@ void csDiagramView::OnStraightenLines(wxCommandEvent& WXUNUSED(event))
csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
csDiagramCommand* cmd = new csDiagramCommand(_T("Straighten lines"), doc);
wxNode* node = m_selections.GetFirst();
wxObjectList::compatibility_iterator node = m_selections.GetFirst();
while (node)
{
wxShape* shape = (wxShape*) node->GetData();
@@ -999,7 +997,7 @@ void csCanvas::OnEndDragLeft(double x, double y, int WXUNUSED(keys))
min_y = wxMin(y, sg_initialY);
max_y = wxMax(y, sg_initialY);
wxNode *node = GetDiagram()->GetShapeList()->GetFirst();
wxObjectList::compatibility_iterator node = GetDiagram()->GetShapeList()->GetFirst();
while (node)
{
wxShape *shape = (wxShape *)node->GetData();