bug fixes for using wxTransientPopupWindow and wxDP_ALLOWNONE support from Andreas...

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

diff --git a/contrib/src/ogl/bmpshape.cpp b/contrib/src/ogl/bmpshape.cpp
index 7b2dfac377ff66b9319193cb0c09ac2b773a056e..e2967d0436d31152588c74bdbd5c490105f9c8b3 100644 (file)
--- a/contrib/src/ogl/bmpshape.cpp
+++ b/contrib/src/ogl/bmpshape.cpp
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -24,20 +24,19 @@
 #include <wx/wx.h>
 #endif
 
 #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
  *
  */
 
 
 /*
  * Bitmap object
  *
  */
 

-IMPLEMENT_DYNAMIC_CLASS(wxBitmapShape, wxShape)
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapShape, wxRectangleShape)

 
 wxBitmapShape::wxBitmapShape():wxRectangleShape(100.0, 50.0)
 {
 
 wxBitmapShape::wxBitmapShape():wxRectangleShape(100.0, 50.0)
 {


@@ -53,15 +52,13 @@ void wxBitmapShape::OnDraw(wxDC& dc)
   if (!m_bitmap.Ok())
     return;
 
   if (!m_bitmap.Ok())
     return;
 

-  wxMemoryDC tempDC;
-  tempDC.SelectObject(m_bitmap);
-  double x, y;
+  int x, y;

   x = WXROUND(m_xpos - m_bitmap.GetWidth() / 2.0);
   y = WXROUND(m_ypos - m_bitmap.GetHeight() / 2.0);
   x = WXROUND(m_xpos - m_bitmap.GetWidth() / 2.0);
   y = WXROUND(m_ypos - m_bitmap.GetHeight() / 2.0);

-  dc.Blit((long) x, (long) y, m_bitmap.GetWidth(), m_bitmap.GetHeight(), &tempDC, 0, 0);
+  dc.DrawBitmap(m_bitmap, x, y, true);

 }
 
 }
 

-void wxBitmapShape::SetSize(double w, double h, bool recursive)
+void wxBitmapShape::SetSize(double w, double h, bool WXUNUSED(recursive))

 {
   if (m_bitmap.Ok())
   {
 {
   if (m_bitmap.Ok())
   {


@@ -82,13 +79,13 @@ 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);
   // 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);
 }
 
 void wxBitmapShape::ReadAttributes(wxExpr *clause)
 {
   wxRectangleShape::ReadAttributes(clause);

-  clause->GetAttributeValue("filename", m_filename);
+  clause->GetAttributeValue(_T("filename"), m_filename);

 }
 #endif
 
 }
 #endif