X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1484b5cc701329c54bbe70f2a155119fd86945c7..6d06e061dc11140151be2914c30c759ee15e3fe7:/contrib/samples/ogl/studio/symbols.cpp diff --git a/contrib/samples/ogl/studio/symbols.cpp b/contrib/samples/ogl/studio/symbols.cpp index 8bc2778ef0..204604e046 100644 --- a/contrib/samples/ogl/studio/symbols.cpp +++ b/contrib/samples/ogl/studio/symbols.cpp @@ -74,41 +74,41 @@ void csSymbolDatabase::AddSymbol(csSymbol* symbol) void csSymbolDatabase::ClearSymbols() { - wxNode* node = m_symbols.First(); + wxObjectList::compatibility_iterator node = m_symbols.GetFirst(); while (node) { - csSymbol* symbol = (csSymbol*) node->Data(); + csSymbol* symbol = (csSymbol*) node->GetData(); delete symbol; - node = node->Next(); + node = node->GetNext(); } m_symbols.Clear(); } csSymbol* csSymbolDatabase::FindSymbol(const wxString& name) const { - wxNode* node = m_symbols.First(); + wxObjectList::compatibility_iterator node = m_symbols.GetFirst(); while (node) { - csSymbol* symbol = (csSymbol*) node->Data(); + csSymbol* symbol = (csSymbol*) node->GetData(); if (symbol->GetName() == name) return symbol; - node = node->Next(); + node = node->GetNext(); } return NULL; } csSymbol* csSymbolDatabase::FindSymbol(int toolId) const { - wxNode* node = m_symbols.First(); + wxObjectList::compatibility_iterator node = m_symbols.GetFirst(); while (node) { - csSymbol* symbol = (csSymbol*) node->Data(); + csSymbol* symbol = (csSymbol*) node->GetData(); if (symbol->GetToolId() == toolId) return symbol; - node = node->Next(); + node = node->GetNext(); } return NULL; } @@ -212,7 +212,7 @@ wxBitmap* csSymbolDatabase::CreateToolBitmap(csSymbol* symbol, const wxSize& too memDC.SetBackground(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), wxSOLID)); memDC.Clear(); - symbol->GetShape()->Show(TRUE); + symbol->GetShape()->Show(true); symbol->GetShape()->Move(memDC, centreX, centreY); memDC.SelectObject(wxNullBitmap);