regenerated after version.bkl changes fixing -compatibility_version for Darwin

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

diff --git a/contrib/src/ogl/bmpshape.cpp b/contrib/src/ogl/bmpshape.cpp
index 359457b8ff28ce0fc3779c2a7ce4c6eeb43f9110..6dba247f75ace66ab0f927f184fe72222284ac94 100644 (file)
--- a/contrib/src/ogl/bmpshape.cpp
+++ b/contrib/src/ogl/bmpshape.cpp
@@ -6,13 +6,9 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "bmpshape.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -36,7 +32,7 @@
  *
  */
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapShape, wxShape)
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapShape, wxRectangleShape)
 
 wxBitmapShape::wxBitmapShape():wxRectangleShape(100.0, 50.0)
 {
@@ -52,7 +48,7 @@ void wxBitmapShape::OnDraw(wxDC& dc)
   if (!m_bitmap.Ok())
     return;
 
-  double x, y;
+  int x, y;
   x = WXROUND(m_xpos - m_bitmap.GetWidth() / 2.0);
   y = WXROUND(m_ypos - m_bitmap.GetHeight() / 2.0);
   dc.DrawBitmap(m_bitmap, x, y, true);