Added SetFont to most controls and controls sample

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

diff --git a/utils/ogl/src/bitmap.cpp b/utils/ogl/src/bitmap.cpp
index cbbdae1ab2f2fdf85d9167276f5e85504a68724c..8004f4a8d94fc89686c69e01177ccb902b820be5 100644 (file)
--- a/utils/ogl/src/bitmap.cpp
+++ b/utils/ogl/src/bitmap.cpp
@@ -57,13 +57,13 @@ void wxBitmapShape::OnDraw(wxDC& dc)
     
   wxMemoryDC tempDC;
   tempDC.SelectObject(m_bitmap);
-  float x, y;
-  x = (long)(m_xpos - m_bitmap.GetWidth() / 2.0);
-  y = (long)(m_ypos - m_bitmap.GetHeight() / 2.0);
+  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);
 }
 
-void wxBitmapShape::SetSize(float w, float h, bool recursive)
+void wxBitmapShape::SetSize(double w, double h, bool recursive)
 {
   if (m_bitmap.Ok())
   {
@@ -101,19 +101,16 @@ void wxBitmapShape::ReadPrologAttributes(wxExpr *clause)
 #endif
 
 // Does the copying for this object
-void wxBitmapShape::Copy(wxBitmapShape& copy)
+void wxBitmapShape::Copy(wxShape& copy)
 {
   wxRectangleShape::Copy(copy);
-  copy.m_bitmap = m_bitmap;
-  copy.SetFilename(m_filename);
-}
 
-// Returns a new instance, and does the copy for this class. Define for each class.
-wxShape *wxBitmapShape::PrivateCopy()
-{
-  wxBitmapShape *obj = new wxBitmapShape;
-  Copy(*obj);
-  return obj;
+  wxASSERT( copy.IsKindOf(CLASSINFO(wxBitmapShape)) ) ;
+
+  wxBitmapShape& bitmapCopy = (wxBitmapShape&) copy;
+
+  bitmapCopy.m_bitmap = m_bitmap;
+  bitmapCopy.SetFilename(m_filename);
 }
 
 void wxBitmapShape::SetBitmap(const wxBitmap& bm)