wxUSE_STL fixes.

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

diff --git a/contrib/samples/ogl/studio/symbols.h b/contrib/samples/ogl/studio/symbols.h
index 390fea9a96831201208567bf73224d1eeb0c829c..b3db979a3093a43a5efacdb66d41778487dce59c 100644 (file)
--- a/contrib/samples/ogl/studio/symbols.h
+++ b/contrib/samples/ogl/studio/symbols.h
@@ -12,13 +12,15 @@
 #ifndef _STUDIO_SYMBOLS_H_
 #define _STUDIO_SYMBOLS_H_
 
 #ifndef _STUDIO_SYMBOLS_H_
 #define _STUDIO_SYMBOLS_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 // #pragma interface
 #endif
 
 #include <wx/docview.h>
 #include <wx/string.h>
 // #pragma interface
 #endif
 
 #include <wx/docview.h>
 #include <wx/string.h>

-#include <wx/wxexpr.h>
+
+#include <wx/deprecated/setup.h>
+#include <wx/deprecated/wxexpr.h>

 
 #include <wx/ogl/ogl.h>
 
 
 #include <wx/ogl/ogl.h>
 


@@ -65,7 +67,7 @@ public:
     void ClearSymbols();
     csSymbol* FindSymbol(const wxString& name) const;
     csSymbol* FindSymbol(int toolId) const;
     void ClearSymbols();
     csSymbol* FindSymbol(const wxString& name) const;
     csSymbol* FindSymbol(int toolId) const;

-    wxBitmap* CreateToolBitmap(csSymbol* symbol);
+    wxBitmap* CreateToolBitmap(csSymbol* symbol, const wxSize& sz);

 
 protected:
     wxList          m_symbols;
 
 protected:
     wxList          m_symbols;