Generate key events in generic wxDataViewCtrl implementation.

[wxWidgets.git] / src / os2 / statbmp.cpp

diff --git a/src/os2/statbmp.cpp b/src/os2/statbmp.cpp
index 3ec5c73c5818ce7268cbf2f66606c09599c7dcf9..c80642962f03768a417df57773aef40af78610f5 100644 (file)
--- a/src/os2/statbmp.cpp
+++ b/src/os2/statbmp.cpp
@@ -17,9 +17,9 @@
 #ifndef WX_PRECOMP
     #include "wx/icon.h"
     #include "wx/window.h"
 #ifndef WX_PRECOMP
     #include "wx/icon.h"
     #include "wx/window.h"

+    #include "wx/dcclient.h"

 #endif
 
 #endif
 

-#include "wx/dcclient.h"

 #include "wx/os2/private.h"
 
 #include <stdio.h>
 #include "wx/os2/private.h"
 
 #include <stdio.h>


@@ -43,7 +43,7 @@ static wxGDIImage* ConvertImage(
     if(!bIsIcon )
     {
         wxASSERT_MSG( wxDynamicCast(&rBitmap, wxBitmap),
     if(!bIsIcon )
     {
         wxASSERT_MSG( wxDynamicCast(&rBitmap, wxBitmap),

-                      _T("not an icon and not a bitmap?") );
+                      wxT("not an icon and not a bitmap?") );

 
         const wxBitmap&             rBmp = (const wxBitmap&)rBitmap;
         wxMask*                     pMask = rBmp.GetMask();
 
         const wxBitmap&             rBmp = (const wxBitmap&)rBitmap;
         wxMask*                     pMask = rBmp.GetMask();


@@ -141,9 +141,7 @@ bool wxStaticBitmap::ImageIsOk() const
 
 void wxStaticBitmap::Free()
 {
 
 void wxStaticBitmap::Free()
 {

-    if (m_pImage)
-        delete m_pImage;
-    m_pImage = NULL;
+    wxDELETE(m_pImage);

 } // end of wxStaticBitmap::Free
 
 wxSize wxStaticBitmap::DoGetBestSize() const
 } // end of wxStaticBitmap::Free
 
 wxSize wxStaticBitmap::DoGetBestSize() const