Crude hack to enable PageUp/DownKeys when controlbar is enabled.

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

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index e2b9f71daf253210a3794f63611fe8b4d8615b1b..c22387c146c932fd2c23b2de7cb5f427bde22341 100644 (file)
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -28,12 +28,15 @@
     #pragma hdrstop
 #endif
 
+#include "wx/window.h"
+#include "wx/msw/private.h"
+
 #ifndef WX_PRECOMP
+    #include "wx/icon.h"
     #include "wx/statbmp.h"
 #endif
 
 #include <stdio.h>
-#include "wx/msw/private.h"
 
 // ---------------------------------------------------------------------------
 // macors
@@ -84,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 char *classname = "STATIC";
+    const wxChar *classname = _T("STATIC");
     int winstyle = m_isIcon ? SS_ICON : SS_BITMAP;
 #else // Win16
-    const char *classname = "BUTTON";
-    int winstyle = BS_OWNERDRAWN;
+    const wxChar *classname = _T("BUTTON");
+    int winstyle = BS_OWNERDRAW;
 #endif // Win32
 
     m_hWnd = (WXHWND)::CreateWindow
                        (
                         classname,
-                        "",
+                        _T(""),
                         winstyle | WS_CHILD | WS_VISIBLE,
                         0, 0, 0, 0,
                         (HWND)parent->GetHWND(),
@@ -103,7 +106,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
                         NULL
                        );
 
-    wxCHECK_MSG( m_hWnd, FALSE, "Failed to create static bitmap" );
+    wxCHECK_MSG( m_hWnd, FALSE, _T("Failed to create static bitmap") );
 
     SetBitmap(bitmap);
 
@@ -186,7 +189,6 @@ void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
     int w, h;
     GetPosition(&x, &y);
     GetSize(&w, &h);
-    RECT rect = { x, y, x + w, y + h };
 
 #ifdef __WIN32__
     HANDLE handle = m_isIcon ? (HANDLE)m_image.icon->GetHICON()
@@ -201,10 +203,14 @@ void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
             height = bitmap.GetHeight();
         if ( width && height )
         {
+            w = width;
+            h = height;
+
             ::MoveWindow((HWND)GetHWND(), x, y, width, height, FALSE);
         }
     }
 
+    RECT rect = { x, y, x + w, y + h };
     InvalidateRect((HWND)GetParent()->GetHWND(), &rect, TRUE);
 }