removed src/gtk/eggtrayicon.h

[wxWidgets.git] / contrib / samples / ogl / studio / symbols.cpp

diff --git a/contrib/samples/ogl/studio/symbols.cpp b/contrib/samples/ogl/studio/symbols.cpp
index 362b0799eaf91367254c724b7bba6810a05ad42f..204604e0466fa8e952fcfaab62e43aa9b32a1a23 100644 (file)
--- a/contrib/samples/ogl/studio/symbols.cpp
+++ b/contrib/samples/ogl/studio/symbols.cpp
@@ -74,7 +74,7 @@ void csSymbolDatabase::AddSymbol(csSymbol* symbol)
 
 void csSymbolDatabase::ClearSymbols()
 {
 
 void csSymbolDatabase::ClearSymbols()
 {

-    wxNode* node = m_symbols.GetFirst();
+    wxObjectList::compatibility_iterator node = m_symbols.GetFirst();

     while (node)
     {
         csSymbol* symbol = (csSymbol*) node->GetData();
     while (node)
     {
         csSymbol* symbol = (csSymbol*) node->GetData();


@@ -87,7 +87,7 @@ void csSymbolDatabase::ClearSymbols()
 
 csSymbol* csSymbolDatabase::FindSymbol(const wxString& name) const
 {
 
 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();
     while (node)
     {
         csSymbol* symbol = (csSymbol*) node->GetData();


@@ -101,7 +101,7 @@ csSymbol* csSymbolDatabase::FindSymbol(const wxString& name) const
 
 csSymbol* csSymbolDatabase::FindSymbol(int toolId) 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();
     while (node)
     {
         csSymbol* symbol = (csSymbol*) node->GetData();


@@ -212,7 +212,7 @@ wxBitmap* csSymbolDatabase::CreateToolBitmap(csSymbol* symbol, const wxSize& too
     memDC.SetBackground(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), wxSOLID));
     memDC.Clear();
 
     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);
     symbol->GetShape()->Move(memDC, centreX, centreY);
 
     memDC.SelectObject(wxNullBitmap);