mingw32 compilation fixes (unfortunately, this effectively disables placing controls...

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

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index 200e920bd85e28294c65ca7880f58ea12495d825..9b809e110e5deff9923788221fda6ed91d4bcfcc 100644 (file)
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -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,7 +106,7 @@ 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);
 
@@ -182,7 +182,11 @@ void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
         }
     }
 
-    RECT rect = { x, y, x + w, y + h };
+    RECT rect ;
+    rect.left   = x ;
+    rect.top    = y ;
+    rect.right  = x + w ;
+    rect.bottom = y + h ;
     InvalidateRect((HWND)GetParent()->GetHWND(), &rect, TRUE);
 }