bitmap and image updates

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

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index 1c0042887be6ab2baf5a049b7a95330b234ff354..e37a780841966d6a94a6548e0e4dcaa52f8b89e1 100644 (file)
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -55,7 +55,7 @@
 // ---------------------------------------------------------------------------
 
 bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
-                            const wxBitmap& bitmap,
+                            const wxGDIImage& bitmap,
                             const wxPoint& pos,
                             const wxSize& size,
                             long style,
@@ -87,17 +87,17 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
 #ifdef __WIN32__
     // create a static control with either SS_BITMAP or SS_ICON style depending
     // on what we have here
-    const wxChar *classname = T("STATIC");
+    const wxChar *classname = wxT("STATIC");
     int winstyle = m_isIcon ? SS_ICON : SS_BITMAP;
 #else // Win16
-    const wxChar *classname = T("BUTTON");
+    const wxChar *classname = wxT("BUTTON");
     int winstyle = BS_OWNERDRAW;
 #endif // Win32
 
     m_hWnd = (WXHWND)::CreateWindow
                        (
                         classname,
-                        T(""),
+                        wxT(""),
                         winstyle | WS_CHILD | WS_VISIBLE,
                         0, 0, 0, 0,
                         (HWND)parent->GetHWND(),
@@ -106,9 +106,9 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
                         NULL
                        );
 
-    wxCHECK_MSG( m_hWnd, FALSE, T("Failed to create static bitmap") );
+    wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create static bitmap") );
 
-    SetBitmap(bitmap);
+    SetImage(bitmap);
 
     // Subclass again for purposes of dialog editing mode
     SubclassWin(m_hWnd);
@@ -122,40 +122,32 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
 
 bool wxStaticBitmap::ImageIsOk() const
 {
-    if ( m_isIcon && m_image.icon )
-        return m_image.icon->Ok();
-    else if ( m_image.bitmap )
-        return m_image.bitmap->Ok();
-    else
-        return FALSE;
+    return m_image && m_image->Ok();
 }
 
 void wxStaticBitmap::Free()
 {
-    if ( m_isIcon )
-        delete m_image.icon;
-    else
-        delete m_image.bitmap;
+    delete m_image;
 
-    m_image.icon = NULL;
+    m_image = NULL;
 }
 
-wxSize wxStaticBitmap::DoGetBestSize()
+wxSize wxStaticBitmap::DoGetBestSize() const
 {
     // reuse the current size (as wxWindow does) instead of using some
     // arbitrary default size (as wxControl, our immediate base class, does)
     return wxWindow::DoGetBestSize();
 }
 
-void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
+void wxStaticBitmap::SetImage(const wxGDIImage& bitmap)
 {
     Free();
 
     m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon));
     if ( m_isIcon )
-        m_image.icon = new wxIcon((const wxIcon&)bitmap);
+        m_image = new wxIcon((const wxIcon&)bitmap);
     else
-        m_image.bitmap = new wxBitmap(bitmap);
+        m_image = new wxBitmap((const wxBitmap &)bitmap);
 
     int x, y;
     int w, h;
@@ -163,9 +155,8 @@ void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
     GetSize(&w, &h);
 
 #ifdef __WIN32__
-    HANDLE handle = m_isIcon ? (HANDLE)m_image.icon->GetHICON()
-                             : (HANDLE)m_image.bitmap->GetHBITMAP();
-    ::SendMessage((HWND)m_hWnd, STM_SETIMAGE,
+    HANDLE handle = (HANDLE)m_image->GetHandle();
+    ::SendMessage(GetHwnd(), STM_SETIMAGE,
                   m_isIcon ? IMAGE_ICON : IMAGE_BITMAP, (LPARAM)handle);
 #endif // Win32
 
@@ -178,16 +169,16 @@ void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
             w = width;
             h = height;
 
-            ::MoveWindow((HWND)GetHWND(), x, y, width, height, FALSE);
+            ::MoveWindow(GetHwnd(), x, y, width, height, FALSE);
         }
     }
 
-    RECT rect ;
-    rect.left   = x ;
-    rect.top    = y ;
-    rect.right  = x + w ;
-    rect.bottom = y + h ;
-    InvalidateRect((HWND)GetParent()->GetHWND(), &rect, TRUE);
+    RECT rect;
+    rect.left   = x;
+    rect.top    = y;
+    rect.right  = x + w;
+    rect.bottom = y + h;
+    InvalidateRect(GetHwndOf(GetParent()), &rect, TRUE);
 }
 
 // under Win32 we use the standard static control style for this