Warning fix.

[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 a58d34056aa8f86059cc6b08f8ff9316c26f0522..69d3a719cfcebced2042102ecc6c146b3081227d 100644 (file)
--- a/contrib/samples/ogl/studio/symbols.cpp
+++ b/contrib/samples/ogl/studio/symbols.cpp
@@ -24,8 +24,7 @@
 #include <wx/wx.h>
 #endif
 
-#include <wx/deprecated/setup.h>
-#include <wx/deprecated/wxexpr.h>
+#include <wx/ogl/ogl.h> // base header of OGL, includes and adjusts wx/deprecated/setup.h
 
 #include "studio.h"
 #include "doc.h"
@@ -74,7 +73,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 +86,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 +100,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();
@@ -189,7 +188,7 @@ wxBitmap* csSymbolDatabase::CreateToolBitmap(csSymbol* symbol, const wxSize& too
     memDC.SelectObject(wxNullBitmap);
 #endif
 
-#if 1       
+#if 1
     wxMemoryDC memDC;
 
     double height, width, maxSize;