Added ability to switch off more components of the size page UI

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

diff --git a/src/os2/statbmp.cpp b/src/os2/statbmp.cpp
index 3ec5c73c5818ce7268cbf2f66606c09599c7dcf9..9a7f0985a39cc2601005a0ae7aa8877d58c3c153 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>


@@ -28,8 +28,6 @@
 // macros
 // ---------------------------------------------------------------------------
 
 // macros
 // ---------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
-

 BEGIN_EVENT_TABLE(wxStaticBitmap, wxWindow)
     EVT_PAINT(wxStaticBitmap::OnPaint)
 END_EVENT_TABLE()
 BEGIN_EVENT_TABLE(wxStaticBitmap, wxWindow)
     EVT_PAINT(wxStaticBitmap::OnPaint)
 END_EVENT_TABLE()


@@ -43,7 +41,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();


@@ -136,14 +134,12 @@ bool wxStaticBitmap::Create( wxWindow*         pParent,
 
 bool wxStaticBitmap::ImageIsOk() const
 {
 
 bool wxStaticBitmap::ImageIsOk() const
 {

-    return(m_pImage && m_pImage->Ok());
+    return(m_pImage && m_pImage->IsOk());

 }
 
 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