added .chm support for Unix (Markus Sinner)

[wxWidgets.git] / contrib / src / ogl / bmpshape.cpp

diff --git a/contrib/src/ogl/bmpshape.cpp b/contrib/src/ogl/bmpshape.cpp
index fc6218e2347522a4e103a1683ae8e79b72ae14e0..f0b1c9ca068e6b3afe8366dc35d9333a708c39dd 100644 (file)
--- a/contrib/src/ogl/bmpshape.cpp
+++ b/contrib/src/ogl/bmpshape.cpp
@@ -14,7 +14,7 @@
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #pragma hdrstop
@@ -24,13 +24,12 @@
 #include <wx/wx.h>
 #endif
 
-#include <wx/wxexpr.h>
+#if wxUSE_PROLOGIO
+#include <wx/deprecated/wxexpr.h>
+#endif
+
+#include "wx/ogl/ogl.h"
 
-#include <wx/ogl/basic.h>
-#include <wx/ogl/basicp.h>
-#include <wx/ogl/canvas.h>
-#include <wx/ogl/bmpshape.h>
-#include <wx/ogl/misc.h>
 
 /*
  * Bitmap object
@@ -41,7 +40,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapShape, wxShape)
 
 wxBitmapShape::wxBitmapShape():wxRectangleShape(100.0, 50.0)
 {
-  m_filename = "";
+  m_filename = wxEmptyString;
 }
 
 wxBitmapShape::~wxBitmapShape()
@@ -52,7 +51,7 @@ void wxBitmapShape::OnDraw(wxDC& dc)
 {
   if (!m_bitmap.Ok())
     return;
-    
+
   wxMemoryDC tempDC;
   tempDC.SelectObject(m_bitmap);
   double x, y;
@@ -61,7 +60,7 @@ void wxBitmapShape::OnDraw(wxDC& dc)
   dc.Blit((long) x, (long) y, m_bitmap.GetWidth(), m_bitmap.GetHeight(), &tempDC, 0, 0);
 }
 
-void wxBitmapShape::SetSize(double w, double h, bool recursive)
+void wxBitmapShape::SetSize(double w, double h, bool WXUNUSED(recursive))
 {
   if (m_bitmap.Ok())
   {
@@ -76,19 +75,19 @@ void wxBitmapShape::SetSize(double w, double h, bool recursive)
   SetDefaultRegionSize();
 }
 
-#ifdef PROLOGIO
+#if wxUSE_PROLOGIO
 void wxBitmapShape::WriteAttributes(wxExpr *clause)
 {
   // Can't really save the bitmap; so instantiate the bitmap
   // at a higher level in the application, from a symbol library.
   wxRectangleShape::WriteAttributes(clause);
-  clause->AddAttributeValueString("filename", m_filename);
+  clause->AddAttributeValueString(_T("filename"), m_filename);
 }
 
 void wxBitmapShape::ReadAttributes(wxExpr *clause)
 {
   wxRectangleShape::ReadAttributes(clause);
-  clause->GetAttributeValue("filename", m_filename);
+  clause->GetAttributeValue(_T("filename"), m_filename);
 }
 #endif