X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..903f689bf7c3c379cba45881373aa9bdd15d6e70:/src/msw/statbmp.cpp

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index 5c0483014d..5685792efe 100644
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -77,6 +77,9 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
 
   // Subclass again for purposes of dialog editing mode
   SubclassWin((WXHWND) static_item);
+
+  SetFont(* GetParent()->GetFont());
+
   SetSize(x, y, width, height);
   return TRUE;
 }
@@ -93,6 +96,8 @@ void wxStaticBitmap::SetSize(int x, int y, int width, int height, int sizeFlags)
   if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     y1 = currentY;
 
+  AdjustForParentClientOrigin(x1, y1, sizeFlags);
+
   int actualWidth = width;
   int actualHeight = height;
 
@@ -154,7 +159,7 @@ bool wxStaticBitmap::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 	HDC hDC = lpDIS->hDC;
 	HDC memDC = ::CreateCompatibleDC(hDC);
 
-	HBITMAP old = ::SelectObject(memDC, (HBITMAP) bitmap->GetHBITMAP());
+	HBITMAP old = (HBITMAP) ::SelectObject(memDC, (HBITMAP) bitmap->GetHBITMAP());
 
 	if (!old)
 		return FALSE;