fixed somebody's poorly done StreamSize-->GetSize transition

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

diff --git a/utils/ogl/src/bmpshape.cpp b/utils/ogl/src/bmpshape.cpp
index 2cc8db9c10806adf2c45858dd58874aeb51b7eb2..a8715057d36b6b9706f2147599c970392c53142d 100644 (file)
--- a/utils/ogl/src/bmpshape.cpp
+++ b/utils/ogl/src/bmpshape.cpp
@@ -24,9 +24,7 @@
 #include <wx/wx.h>
 #endif
 
-#ifdef PROLOGIO
 #include <wx/wxexpr.h>
-#endif
 
 #include "basic.h"
 #include "basicp.h"
@@ -60,7 +58,7 @@ void wxBitmapShape::OnDraw(wxDC& dc)
   double x, y;
   x = WXROUND(m_xpos - m_bitmap.GetWidth() / 2.0);
   y = WXROUND(m_ypos - m_bitmap.GetHeight() / 2.0);
-  dc.Blit(x, y, m_bitmap.GetWidth(), m_bitmap.GetHeight(), &tempDC, 0, 0);
+  dc.Blit((long) x, (long) y, m_bitmap.GetWidth(), m_bitmap.GetHeight(), &tempDC, 0, 0);
 }
 
 void wxBitmapShape::SetSize(double w, double h, bool recursive)
@@ -79,23 +77,17 @@ void wxBitmapShape::SetSize(double w, double h, bool recursive)
 }
 
 #ifdef PROLOGIO
-// Prolog database stuff
-char *wxBitmapShape::GetFunctor()
-{
-  return "node_image";
-}
-
-void wxBitmapShape::WritePrologAttributes(wxExpr *clause)
+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::WritePrologAttributes(clause);
+  wxRectangleShape::WriteAttributes(clause);
   clause->AddAttributeValueString("filename", m_filename);
 }
 
-void wxBitmapShape::ReadPrologAttributes(wxExpr *clause)
+void wxBitmapShape::ReadAttributes(wxExpr *clause)
 {
-  wxRectangleShape::ReadPrologAttributes(clause);
+  wxRectangleShape::ReadAttributes(clause);
   clause->GetAttributeValue("filename", m_filename);
 }
 #endif