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@28403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-07-22 19:07:59 +00:00
parent b02a6dc2b6
commit 36ca94a260
10 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/samples/ogl/studio/doc.cpp
View File

@@ -120,7 +120,7 @@ csDiagramCommand::csDiagramCommand(const wxString& name, csDiagramDocument *doc,
csDiagramCommand::~csDiagramCommand()
{
wxNode* node = m_states.GetFirst();
wxObjectList::compatibility_iterator node = m_states.GetFirst();
while (node)
{
csCommandState* state = (csCommandState*) node->GetData();
@@ -147,14 +147,14 @@ void csDiagramCommand::InsertState(csCommandState* state)
// Schedule all lines connected to the states to be cut.
void csDiagramCommand::RemoveLines()
{
wxNode* node = m_states.GetFirst();
wxObjectList::compatibility_iterator node = m_states.GetFirst();
while (node)
{
csCommandState* state = (csCommandState*) node->GetData();
wxShape* shape = state->GetShapeOnCanvas();
wxASSERT( (shape != NULL) );
wxNode *node1 = shape->GetLines().GetFirst();
wxObjectList::compatibility_iterator node1 = shape->GetLines().GetFirst();
while (node1)
{
wxLineShape *line = (wxLineShape *)node1->GetData();
@@ -172,7 +172,7 @@ void csDiagramCommand::RemoveLines()
csCommandState* csDiagramCommand::FindStateByShape(wxShape* shape)
{
wxNode* node = m_states.GetFirst();
wxObjectList::compatibility_iterator node = m_states.GetFirst();
while (node)
{
csCommandState* state = (csCommandState*) node->GetData();
@@ -185,7 +185,7 @@ csCommandState* csDiagramCommand::FindStateByShape(wxShape* shape)
bool csDiagramCommand::Do()
{
wxNode* node = m_states.GetFirst();
wxObjectList::compatibility_iterator node = m_states.GetFirst();
while (node)
{
csCommandState* state = (csCommandState*) node->GetData();
@@ -200,7 +200,7 @@ bool csDiagramCommand::Undo()
{
// Undo in reverse order, so e.g. shapes get added
// back before the lines do.
wxNode* node = m_states.GetLast();
wxObjectList::compatibility_iterator node = m_states.GetLast();
while (node)
{
csCommandState* state = (csCommandState*) node->GetData();

8
contrib/samples/ogl/studio/shapes.cpp
View File

@@ -301,7 +301,7 @@ void csEvtHandler::OnDragLeft(bool draw, double x, double y, int keys, int attac
GetShape()->GetEventHandler()->OnDrawOutline(dc, xx, yy, w, h);
// Draw bounding box for other selected shapes
wxNode* node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
wxObjectList::compatibility_iterator node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
while (node)
{
wxShape* shape = (wxShape*) node->GetData();
@@ -360,7 +360,7 @@ void csEvtHandler::OnBeginDragLeft(double x, double y, int keys, int attachment)
GetShape()->GetEventHandler()->OnDrawOutline(dc, xx, yy, w, h);
// Draw bounding box for other selected shapes
wxNode* node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
wxObjectList::compatibility_iterator node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
while (node)
{
wxShape* shape = (wxShape*) node->GetData();
@@ -415,7 +415,7 @@ void csEvtHandler::OnEndDragLeft(double x, double y, int keys, int attachment)
new csCommandState(ID_CS_MOVE, newShape, GetShape()));
// Move line points
wxNode* node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
wxObjectList::compatibility_iterator node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
while (node)
{
wxShape* shape = (wxShape*) node->GetData();
@@ -429,7 +429,7 @@ void csEvtHandler::OnEndDragLeft(double x, double y, int keys, int attachment)
{
wxLineShape* newLineShape = (wxLineShape*) lineShape->CreateNewCopy();
wxNode *node1 = newLineShape->GetLineControlPoints()->GetFirst();
wxObjectList::compatibility_iterator node1 = newLineShape->GetLineControlPoints()->GetFirst();
while (node1)
{
wxRealPoint *point = (wxRealPoint *)node1->GetData();

6
contrib/samples/ogl/studio/symbols.cpp
View File

@@ -74,7 +74,7 @@ void csSymbolDatabase::AddSymbol(csSymbol* symbol)
void csSymbolDatabase::ClearSymbols()
{
wxNode* node = m_symbols.GetFirst();
wxObjectList::compatibility_iterator node = m_symbols.GetFirst();
while (node)
{
csSymbol* symbol = (csSymbol*) node->GetData();
@@ -87,7 +87,7 @@ void csSymbolDatabase::ClearSymbols()
csSymbol* csSymbolDatabase::FindSymbol(const wxString& name) const
{
wxNode* node = m_symbols.GetFirst();
wxObjectList::compatibility_iterator node = m_symbols.GetFirst();
while (node)
{
csSymbol* symbol = (csSymbol*) node->GetData();
@@ -101,7 +101,7 @@ csSymbol* csSymbolDatabase::FindSymbol(const wxString& name) const
csSymbol* csSymbolDatabase::FindSymbol(int toolId) const
{
wxNode* node = m_symbols.GetFirst();
wxObjectList::compatibility_iterator node = m_symbols.GetFirst();
while (node)
{
csSymbol* symbol = (csSymbol*) node->GetData();

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

@@ -199,7 +199,7 @@ wxShape *csDiagramView::FindFirstSelectedShape(void)
{
csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
wxShape *theShape = NULL;
wxNode *node = doc->GetDiagram()->GetShapeList()->GetFirst();
wxObjectList::compatibility_iterator node = doc->GetDiagram()->GetShapeList()->GetFirst();
while (node)
{
wxShape *eachShape = (wxShape *)node->GetData();
@@ -216,7 +216,7 @@ wxShape *csDiagramView::FindFirstSelectedShape(void)
void csDiagramView::FindSelectedShapes(wxList& selections, wxClassInfo* toFind)
{
csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
wxNode *node = doc->GetDiagram()->GetShapeList()->GetFirst();
wxObjectList::compatibility_iterator node = doc->GetDiagram()->GetShapeList()->GetFirst();
while (node)
{
wxShape *eachShape = (wxShape *)node->GetData();
@@ -331,7 +331,7 @@ void csDiagramView::DoCut(wxList& shapes)
{
csDiagramCommand* cmd = new csDiagramCommand(_T("Cut"), doc);
wxNode* node = shapes.GetFirst();
wxObjectList::compatibility_iterator node = shapes.GetFirst();
while (node)
{
wxShape *theShape = (wxShape*) node->GetData();
@@ -363,8 +363,8 @@ void csDiagramView::DoCmd(wxList& shapes, wxList& oldShapes, int cmd, const wxSt
{
csDiagramCommand* command = new csDiagramCommand(op, doc);
wxNode* node = shapes.GetFirst();
wxNode* node1 = oldShapes.GetFirst();
wxObjectList::compatibility_iterator node = shapes.GetFirst();
wxObjectList::compatibility_iterator node1 = oldShapes.GetFirst();
while (node && node1)
{
wxShape *theShape = (wxShape*) node->GetData();
@@ -410,7 +410,7 @@ void csDiagramView::OnChangeBackgroundColour(wxCommandEvent& WXUNUSED(event))
csDiagramCommand* cmd = new csDiagramCommand(_T("Change colour"), doc);
wxNode* node = selections.GetFirst();
wxObjectList::compatibility_iterator node = selections.GetFirst();
while (node)
{
wxShape *theShape = (wxShape*) node->GetData();
@@ -479,7 +479,7 @@ void csDiagramView::ApplyPointSize(int pointSize)
{
csDiagramCommand* cmd = new csDiagramCommand(_T("Point size"), doc);
wxNode* node = selections.GetFirst();
wxObjectList::compatibility_iterator node = selections.GetFirst();
while (node)
{
wxShape *theShape = (wxShape*) node->GetData();
@@ -531,7 +531,7 @@ void csDiagramView::SelectAll(bool select)
wxList selections;
FindSelectedShapes(selections);
wxNode* node = selections.GetFirst();
wxObjectList::compatibility_iterator node = selections.GetFirst();
while (node)
{
wxShape *theShape = (wxShape*) node->GetData();
@@ -544,7 +544,7 @@ void csDiagramView::SelectAll(bool select)
else
{
csDiagramDocument *doc = (csDiagramDocument *)GetDocument();
wxNode *node = doc->GetDiagram()->GetShapeList()->GetFirst();
wxObjectList::compatibility_iterator node = doc->GetDiagram()->GetShapeList()->GetFirst();
while (node)
{
wxShape *eachShape = (wxShape *)node->GetData();