Fixed .Position -> .GetPosition for wxMouseEvent

[wxWidgets.git] / src / msw / bitmap.cpp

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 29926d61d2a56b25285f62832f0c1cf53e9180ce..9498c65e43f4877c6138649e9472cc060aec96d0 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -77,22 +77,14 @@ wxBitmapRefData::wxBitmapRefData()
 
 wxBitmapRefData::~wxBitmapRefData()
 {
 
 wxBitmapRefData::~wxBitmapRefData()
 {

-  if (m_selectedInto)
-  {
-    wxChar buf[200];
-    wxSprintf(buf, _T("Bitmap was deleted without selecting out of wxMemoryDC %X."), (unsigned int) m_selectedInto);
-    wxFatalError(buf);
-  }
-  if (m_hBitmap)
-  {
-    DeleteObject((HBITMAP) m_hBitmap);
-  }
-  m_hBitmap = 0 ;
+    wxASSERT_MSG( !m_selectedInto,
+                  wxT("deleting bitmap still selected into wxMemoryDC") );

 
 

-  if (m_bitmapMask)
-    delete m_bitmapMask;
-  m_bitmapMask = NULL;
+    if ( m_hBitmap)
+        DeleteObject((HBITMAP) m_hBitmap);

 
 

+    if ( m_bitmapMask )
+        delete m_bitmapMask;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -143,12 +135,9 @@ bool wxBitmap::FreeResource(bool WXUNUSED(force))
   if ( !M_BITMAPDATA )
   return FALSE;
 
   if ( !M_BITMAPDATA )
   return FALSE;
 

-  if (M_BITMAPDATA->m_selectedInto)
-  {
-    wxChar buf[200];
-    wxSprintf(buf, _T("Bitmap %X was deleted without selecting out of wxMemoryDC %X."), (unsigned int) this, (unsigned int) M_BITMAPDATA->m_selectedInto);
-    wxFatalError(buf);
-  }
+  wxASSERT_MSG( !M_BITMAPDATA->m_selectedInto,
+                wxT("freeing bitmap still selected into wxMemoryDC") );
+

   if (M_BITMAPDATA->m_hBitmap)
   {
     DeleteObject((HBITMAP) M_BITMAPDATA->m_hBitmap);
   if (M_BITMAPDATA->m_hBitmap)
   {
     DeleteObject((HBITMAP) M_BITMAPDATA->m_hBitmap);


@@ -255,7 +244,7 @@ bool wxBitmap::LoadFile(const wxString& filename, long type)
   wxBitmapHandler *handler = FindHandler(type);
 
   if ( handler == NULL ) {
   wxBitmapHandler *handler = FindHandler(type);
 
   if ( handler == NULL ) {

-    wxLogWarning(_T("no bitmap handler for type %d defined."), type);
+    wxLogWarning(wxT("no bitmap handler for type %d defined."), type);

 
     return FALSE;
   }
 
     return FALSE;
   }


@@ -272,7 +261,7 @@ bool wxBitmap::Create(void *data, long type, int width, int height, int depth)
   wxBitmapHandler *handler = FindHandler(type);
 
   if ( handler == NULL ) {
   wxBitmapHandler *handler = FindHandler(type);
 
   if ( handler == NULL ) {

-    wxLogWarning(_T("no bitmap handler for type %d defined."), type);
+    wxLogWarning(wxT("no bitmap handler for type %d defined."), type);

 
     return FALSE;
   }
 
     return FALSE;
   }


@@ -285,7 +274,7 @@ bool wxBitmap::SaveFile(const wxString& filename, int type, const wxPalette *pal
   wxBitmapHandler *handler = FindHandler(type);
 
   if ( handler == NULL ) {
   wxBitmapHandler *handler = FindHandler(type);
 
   if ( handler == NULL ) {

-    wxLogWarning(_T("no bitmap handler for type %d defined."), type);
+    wxLogWarning(wxT("no bitmap handler for type %d defined."), type);

 
     return FALSE;
   }
 
     return FALSE;
   }


@@ -352,9 +341,10 @@ void wxBitmap::SetMask(wxMask *mask)
 void wxBitmap::SetHBITMAP(WXHBITMAP bmp)
 {
   if (!M_BITMAPDATA)
 void wxBitmap::SetHBITMAP(WXHBITMAP bmp)
 {
   if (!M_BITMAPDATA)

-  m_refData = new wxBitmapRefData;
+    m_refData = new wxBitmapRefData;

 
   M_BITMAPDATA->m_hBitmap = bmp;
 
   M_BITMAPDATA->m_hBitmap = bmp;

+  M_BITMAPDATA->m_ok = bmp != 0;

 }
 
 void wxBitmap::AddHandler(wxBitmapHandler *handler)
 }
 
 void wxBitmap::AddHandler(wxBitmapHandler *handler)


@@ -682,7 +672,7 @@ bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long
     }
 
   // it's probably not found
     }
 
   // it's probably not found

-  wxLogError(_T("Can't load bitmap '%s' from resources! Check .rc file."), name.c_str());
+  wxLogError(wxT("Can't load bitmap '%s' from resources! Check .rc file."), name.c_str());

 
   return FALSE;
 }
 
   return FALSE;
 }