More Motif stuff incl. beginnings of wxToolBar

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

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index 5c0483014dfccc8714b05d92c31470fac41f6848..8cf17984c8513efd2d3e0b35bd24927badc05543 100644 (file)
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -46,8 +46,8 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
   SetName(name);
   if (parent) parent->AddChild(this);
 
-  m_backgroundColour = parent->GetDefaultBackgroundColour() ;
-  m_foregroundColour = parent->GetDefaultForegroundColour() ;
+  m_backgroundColour = parent->GetBackgroundColour() ;
+  m_foregroundColour = parent->GetForegroundColour() ;
 
   if ( id == -1 )
        m_windowId = (int)NewControlId();
@@ -69,14 +69,23 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
   // Use an ownerdraw button to produce a static bitmap, since there's
   // no ownerdraw static.
   // TODO: perhaps this should be a static item, with style SS_BITMAP.
-  HWND static_item =
-    CreateWindowEx(0, "BUTTON", "", BS_OWNERDRAW | WS_TABSTOP | WS_CHILD,
-                    0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
-                    wxGetInstance(), NULL);
-  m_hWnd = (WXHWND) static_item;
+  m_hWnd = (WXHWND)CreateWindow
+           (
+            "BUTTON",
+            "",
+            BS_OWNERDRAW | WS_TABSTOP | WS_CHILD | WS_VISIBLE,
+            0, 0, 0, 0,
+            (HWND)parent->GetHWND(),
+            (HMENU)m_windowId,
+            wxGetInstance(),
+            NULL
+           );
 
   // Subclass again for purposes of dialog editing mode
-  SubclassWin((WXHWND) static_item);
+  SubclassWin(m_hWnd);
+
+  SetFont(* GetParent()->GetFont());
+
   SetSize(x, y, width, height);
   return TRUE;
 }
@@ -93,6 +102,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 +165,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;