Aliases for [G|S]etCaretLineBack

[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..5aaffd681678355fee7a4ee60764fab55a16aec4 100644 (file)
--- a/contrib/samples/ogl/studio/symbols.cpp
+++ b/contrib/samples/ogl/studio/symbols.cpp
@@ -1,18 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        symbols.cpp
+// Name:        contrib/samples/ogl/studio/symbols.cpp
 // Purpose:     Implements the Studio symbol database
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-// #pragma implementation
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -21,11 +17,10 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include <wx/wx.h>
+#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 +69,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 +82,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 +96,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 +184,7 @@ wxBitmap* csSymbolDatabase::CreateToolBitmap(csSymbol* symbol, const wxSize& too
     memDC.SelectObject(wxNullBitmap);
 #endif
 
-#if 1       
+#if 1
     wxMemoryDC memDC;
 
     double height, width, maxSize;
@@ -212,7 +207,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);
@@ -220,4 +215,3 @@ wxBitmap* csSymbolDatabase::CreateToolBitmap(csSymbol* symbol, const wxSize& too
 
     return newBitmap;
 }
-