wxEVT_COMMAND_CHOICE_SELECTED => wxEVT_COMMAND_COMBOBOX_SELECTED

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

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index dfdaec349610705e41aa94fb8a3245ba9b5336e9..89f992643f7c6f35e48f55400d92e326efee4d92 100644 (file)
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -35,24 +35,24 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
  * wxStaticBitmap
  */
 
-bool wxStaticBitmap::Create(wxWindow *parent, const wxWindowID id,
+bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
            const wxBitmap& bitmap,
            const wxPoint& pos,
            const wxSize& size,
-           const long style,
+           long style,
            const wxString& name)
 {
   m_messageBitmap = bitmap;
   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();
+    m_windowId = (int)NewControlId();
   else
-       m_windowId = id;
+    m_windowId = id;
 
   int x = pos.x;
   int y = pos.y;
@@ -60,28 +60,37 @@ bool wxStaticBitmap::Create(wxWindow *parent, const wxWindowID id,
   int height = size.y;
 
   if ( width < 0 && bitmap.Ok() )
-       width = bitmap.GetWidth();
+    width = bitmap.GetWidth();
   if ( height < 0 && bitmap.Ok() )
-       height = bitmap.GetHeight();
+    height = bitmap.GetHeight();
 
   m_windowStyle = style;
 
   // 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;
 }
 
-void wxStaticBitmap::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
+void wxStaticBitmap::SetSize(int x, int y, int width, int height, int sizeFlags)
 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);
@@ -93,6 +102,8 @@ void wxStaticBitmap::SetSize(const int x, const int y, const int width, const in
   if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     y1 = currentY;
 
+  AdjustForParentClientOrigin(x1, y1, sizeFlags);
+
   int actualWidth = width;
   int actualHeight = height;
 
@@ -110,17 +121,6 @@ void wxStaticBitmap::SetSize(const int x, const int y, const int width, const in
   else actualHeight = height;
 
   MoveWindow((HWND) GetHWND(), x1, y1, actualWidth, actualHeight, TRUE);
-
-  if (!((width == -1) && (height == -1)))
-  {
-#if WXWIN_COMPATIBILITY
-    GetEventHandler()->OldOnSize(actualWidth, actualHeight);
-#else
-    wxSizeEvent event(wxSize(actualWidth, actualHeight), m_windowId);
-    event.eventObject = this;
-    GetEventHandler()->ProcessEvent(event);
-#endif
-  }
 }
 
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
@@ -135,7 +135,7 @@ void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
   rect.left = x; rect.top = y; rect.right = x + w; rect.bottom = y + h;
 
   if ( bitmap.Ok() )
-       MoveWindow((HWND) GetHWND(), x, y, bitmap.GetWidth(), bitmap.GetHeight(),
+    MoveWindow((HWND) GetHWND(), x, y, bitmap.GetWidth(), bitmap.GetHeight(),
              FALSE);
   
   InvalidateRect((HWND) GetParent()->GetHWND(), &rect, TRUE);
@@ -143,47 +143,45 @@ void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 
 bool wxStaticBitmap::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 {
-       long style = GetWindowLong((HWND) GetHWND(), GWL_STYLE);
-#ifdef __WIN32__
-       if ((style & 0xFF) == SS_BITMAP)
-       {
-               // Should we call Default() here?
-//             Default();
-
-               // Let default procedure draw the bitmap, which is defined
-               // in the Windows resource.
-               return FALSE;
-       }
+    long style = GetWindowLong((HWND) GetHWND(), GWL_STYLE);
+#if defined(__WIN32__) && defined(SS_BITMAP)
+    if ((style & 0xFF) == SS_BITMAP)
+    {
+        // Should we call Default() here?
+//      Default();
+
+        // Let default procedure draw the bitmap, which is defined
+        // in the Windows resource.
+        return FALSE;
+    }
 #endif
 
     LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT) item;
 
-       wxBitmap* bitmap = &m_messageBitmap;
-       if ( !bitmap->Ok() )
-               return FALSE;
-
-       HDC hDC = lpDIS->hDC;
-       HDC memDC = ::CreateCompatibleDC(hDC);
+    wxBitmap* bitmap = &m_messageBitmap;
+    if ( !bitmap->Ok() )
+        return FALSE;
 
-       HBITMAP old = ::SelectObject(memDC, (HBITMAP) bitmap->GetHBITMAP());
+    HDC hDC = lpDIS->hDC;
+    HDC memDC = ::CreateCompatibleDC(hDC);
 
-       if (!old)
-               return FALSE;
+    HBITMAP old = (HBITMAP) ::SelectObject(memDC, (HBITMAP) bitmap->GetHBITMAP());
 
-       RECT rect = lpDIS->rcItem;
+    if (!old)
+        return FALSE;
 
        int x = lpDIS->rcItem.left;
        int y = lpDIS->rcItem.top;
        int width = lpDIS->rcItem.right - x;
        int height = lpDIS->rcItem.bottom - y;
 
-       // Centre the bitmap in the control area
-       int x1 = (int) (x + ((width - bitmap->GetWidth()) / 2));
-       int y1 = (int) (y + ((height - bitmap->GetHeight()) / 2));
+    // Centre the bitmap in the control area
+    int x1 = (int) (x + ((width - bitmap->GetWidth()) / 2));
+    int y1 = (int) (y + ((height - bitmap->GetHeight()) / 2));
 
-       ::BitBlt(hDC, x1, y1, bitmap->GetWidth(), bitmap->GetHeight(), memDC, 0, 0, SRCCOPY);
+    ::BitBlt(hDC, x1, y1, bitmap->GetWidth(), bitmap->GetHeight(), memDC, 0, 0, SRCCOPY);
 
-       ::SelectObject(memDC, old);
+    ::SelectObject(memDC, old);
 
     ::DeleteDC(memDC);