X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1fc25a89ac1e6c5208db24bfc0abc8666b791dc6..084db46c8b4f3f8d5e6a5f55e09e04f5a680c8a5:/contrib/src/ogl/bmpshape.cpp

diff --git a/contrib/src/ogl/bmpshape.cpp b/contrib/src/ogl/bmpshape.cpp
index fc6218e234..058262db6a 100644
--- 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,7 +24,9 @@
 #include <wx/wx.h>
 #endif
 
-#include <wx/wxexpr.h>
+#if wxUSE_DEPRECATED
+#include <wx/deprecated/wxexpr.h>
+#endif
 
 #include <wx/ogl/basic.h>
 #include <wx/ogl/basicp.h>
@@ -41,7 +43,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapShape, wxShape)
 
 wxBitmapShape::wxBitmapShape():wxRectangleShape(100.0, 50.0)
 {
-  m_filename = "";
+  m_filename = wxEmptyString;
 }
 
 wxBitmapShape::~wxBitmapShape()
@@ -52,7 +54,7 @@ void wxBitmapShape::OnDraw(wxDC& dc)
 {
   if (!m_bitmap.Ok())
     return;
-    
+
   wxMemoryDC tempDC;
   tempDC.SelectObject(m_bitmap);
   double x, y;
@@ -76,7 +78,7 @@ 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