#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
// ---------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARY
- IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
// ===========================================================================
// implementation
// ---------------------------------------------------------------------------
bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
- const wxBitmap& bitmap,
+ const wxGDIImage& bitmap,
const wxPoint& pos,
const wxSize& size,
long style,
m_windowStyle = style;
+ // we may have either bitmap or icon: if a bitmap with mask is passed, we
+ // will transform it to an icon ourselves because otherwise the mask will
+ // be ignored by Windows
+ wxIcon *icon = (wxIcon *)NULL;
m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon));
+#ifdef __WIN16__
+ wxASSERT_MSG( !m_isIcon, "Icons are not supported in wxStaticBitmap under WIN16." );
+#endif
+
+#ifndef __WIN16__
+ if ( !m_isIcon )
+ {
+ const wxBitmap& bmp = (const wxBitmap&)bitmap;
+ wxMask *mask = bmp.GetMask();
+ if ( mask && mask->GetMaskBitmap() )
+ {
+ icon = new wxIcon;
+ icon->CopyFromBitmap(bmp);
+
+ m_isIcon = TRUE;
+ }
+ }
+#endif
+
#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 = wxT("STATIC");
int winstyle = m_isIcon ? SS_ICON : SS_BITMAP;
#else // Win16
- const char *classname = "BUTTON";
+ const wxChar *classname = wxT("BUTTON");
int winstyle = BS_OWNERDRAW;
#endif // Win32
m_hWnd = (WXHWND)::CreateWindow
(
classname,
- "",
- winstyle | WS_CHILD | WS_VISIBLE,
+ wxT(""),
+ // NOT DISABLED!!! We want to move it in Dialog Editor.
+ winstyle | WS_CHILD | WS_VISIBLE /* | WS_CLIPSIBLINGS */ , // | WS_DISABLED,
0, 0, 0, 0,
(HWND)parent->GetHWND(),
(HMENU)m_windowId,
NULL
);
- wxCHECK_MSG( m_hWnd, FALSE, "Failed to create static bitmap" );
+ wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create static bitmap") );
- SetBitmap(bitmap);
+ SetImage(icon ? icon : &bitmap);
+ delete icon; // may be NULL, ok
// Subclass again for purposes of dialog editing mode
SubclassWin(m_hWnd);
bool wxStaticBitmap::ImageIsOk() const
{
- if ( m_isIcon && m_image.icon )
- return m_image.icon->Ok();
- else if ( m_image.bitmap )
- return m_image.bitmap->Ok();
- else
- return FALSE;
+ return m_image && m_image->Ok();
}
void wxStaticBitmap::Free()
{
- if ( m_isIcon )
- delete m_image.icon;
- else
- delete m_image.bitmap;
+ delete m_image;
- m_image.icon = NULL;
+ m_image = NULL;
}
-void wxStaticBitmap::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+wxSize wxStaticBitmap::DoGetBestSize() const
{
- int currentX, currentY;
- GetPosition(¤tX, ¤tY);
- int x1 = x;
- int y1 = y;
-
- if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- x1 = currentX;
- if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- y1 = currentY;
-
- AdjustForParentClientOrigin(x1, y1, sizeFlags);
-
- int actualWidth = width;
- int actualHeight = height;
-
- int ww, hh;
- GetSize(&ww, &hh);
-
- // If we're prepared to use the existing width, then...
- if (width == -1 && ((sizeFlags & wxSIZE_AUTO_WIDTH) != wxSIZE_AUTO_WIDTH))
- actualWidth = ww;
- else
- actualWidth = width;
-
- // If we're prepared to use the existing height, then...
- if (height == -1 && ((sizeFlags & wxSIZE_AUTO_HEIGHT) != wxSIZE_AUTO_HEIGHT))
- actualHeight = hh;
- else
- actualHeight = height;
-
- MoveWindow((HWND) GetHWND(), x1, y1, actualWidth, actualHeight, TRUE);
+ // reuse the current size (as wxWindow does) instead of using some
+ // arbitrary default size (as wxControl, our immediate base class, does)
+ return wxWindow::DoGetBestSize();
}
-void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
+void wxStaticBitmap::SetImage(const wxGDIImage* image)
{
Free();
- m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon));
+ const wxIcon *icon = wxDynamicCast(image, wxIcon);
+ m_isIcon = icon != NULL;
if ( m_isIcon )
- m_image.icon = new wxIcon((const wxIcon&)bitmap);
+ {
+ m_image = new wxIcon(*icon);
+ }
else
- m_image.bitmap = new wxBitmap(bitmap);
+ {
+ wxASSERT_MSG( wxDynamicCast(image, wxBitmap),
+ _T("not an icon and not a bitmap?") );
+
+ const wxBitmap *bitmap = (wxBitmap *)image;
+
+ m_image = new wxBitmap(*bitmap);
+ }
int x, y;
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()
- : (HANDLE)m_image.bitmap->GetHBITMAP();
- ::SendMessage((HWND)m_hWnd, STM_SETIMAGE,
+ HANDLE handle = (HANDLE)m_image->GetHandle();
+ ::SendMessage(GetHwnd(), STM_SETIMAGE,
m_isIcon ? IMAGE_ICON : IMAGE_BITMAP, (LPARAM)handle);
#endif // Win32
if ( ImageIsOk() )
{
- int width = bitmap.GetWidth(),
- height = bitmap.GetHeight();
+ int width = image->GetWidth(),
+ height = image->GetHeight();
if ( width && height )
{
- ::MoveWindow((HWND)GetHWND(), x, y, width, height, FALSE);
+ w = width;
+ h = height;
+
+ ::MoveWindow(GetHwnd(), x, y, width, height, FALSE);
}
}
- InvalidateRect((HWND)GetParent()->GetHWND(), &rect, TRUE);
+ RECT rect;
+ rect.left = x;
+ rect.top = y;
+ rect.right = x + w;
+ rect.bottom = y + h;
+ InvalidateRect(GetHwndOf(GetParent()), &rect, TRUE);
}
// under Win32 we use the standard static control style for this
{
LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT) item;
- wxBitmap* bitmap = m_image.bitmap;
+ wxCHECK_MSG( !m_isIcon, FALSE, _T("icons not supported in wxStaticBitmap") );
+
+ wxBitmap* bitmap = (wxBitmap *)m_image;
if ( !bitmap->Ok() )
return FALSE;
return TRUE;
}
+#endif // Win16
+// We need this or the control can never be moved e.g. in Dialog Editor.
long wxStaticBitmap::MSWWindowProc(WXUINT nMsg,
WXWPARAM wParam,
WXLPARAM lParam)
return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
}
-#endif // Win16
+
projects / wxWidgets.git / blobdiff