Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hack to allow icons in wxStaticBitmap as well as bitmaps

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-03-24 23:35:16 +00:00
parent 54bdd8b0ff
commit 9e3e082102
2 changed files with 218 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
include/wx/msw/statbmp.h
View File

@@ -20,14 +20,16 @@
WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
// a control showing an icon or a bitmap
class WXDLLEXPORT wxStaticBitmap : public wxControl
{
DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
public:
wxStaticBitmap() { }
wxStaticBitmap() { Init(); }
wxStaticBitmap(wxWindow *parent, wxWindowID id,
wxStaticBitmap(wxWindow *parent,
wxWindowID id,
const wxBitmap& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
@@ -37,29 +39,52 @@ public:
Create(parent, id, label, pos, size, style, name);
}
bool Create(wxWindow *parent, wxWindowID id,
bool Create(wxWindow *parent,
wxWindowID id,
const wxBitmap& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& name = wxStaticBitmapNameStr);
virtual ~wxStaticBitmap() { Free(); }
virtual void SetIcon(const wxIcon& icon) { SetBitmap(icon); }
virtual void SetBitmap(const wxBitmap& bitmap);
virtual void Command(wxCommandEvent& WXUNUSED(event)) { }
virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) { }
wxBitmap& GetBitmap(void) const { return (wxBitmap&) m_messageBitmap; }
// assert failure is provoked by an attempt to get an icon from bitmap or
// vice versa
const wxIcon& GetIcon() const
{ wxASSERT( m_isIcon ); return *m_image.icon; }
const wxBitmap& GetBitmap() const
{ wxASSERT( !m_isIcon ); return *m_image.bitmap; }
// overriden base class virtuals
virtual bool AcceptsFocus() const { return FALSE; }
// Implementation
// IMPLEMENTATION
virtual void Command(wxCommandEvent& WXUNUSED(event)) { }
virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) { }
#ifdef __WIN16__
virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
#endif // __WIN16__
protected:
wxBitmap m_messageBitmap;
void Init() { m_isIcon = TRUE; m_image.icon = NULL; }
void Free();
// TRUE if icon/bitmap is valid
bool ImageIsOk() const;
// we can have either an icon or a bitmap
bool m_isIcon;
union
{
wxIcon *icon;
wxBitmap *bitmap;
} m_image;
virtual void DoSetSize(int x, int y,
int width, int height,

138
src/msw/statbmp.cpp
View File

@@ -9,6 +9,14 @@
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
// ===========================================================================
// declarations
// ===========================================================================
// ---------------------------------------------------------------------------
// headers
// ---------------------------------------------------------------------------
#ifdef __GNUG__
#pragma implementation "statbmp.h"
#endif
@@ -27,13 +35,21 @@
#include <stdio.h>
#include "wx/msw/private.h"
// ---------------------------------------------------------------------------
// macors
// ---------------------------------------------------------------------------
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
#endif
/*
* wxStaticBitmap
*/
// ===========================================================================
// implementation
// ===========================================================================
// ---------------------------------------------------------------------------
// wxStaticBitmap
// ---------------------------------------------------------------------------
bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
const wxBitmap& bitmap,
@@ -42,9 +58,11 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
long style,
const wxString& name)
{
m_messageBitmap = bitmap;
Init();
SetName(name);
if (parent) parent->AddChild(this);
if (parent)
parent->AddChild(this);
m_backgroundColour = parent->GetBackgroundColour() ;
m_foregroundColour = parent->GetForegroundColour() ;
@@ -59,21 +77,25 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
int width = size.x;
int height = size.y;
if ( width < 0 && bitmap.Ok() )
width = bitmap.GetWidth();
if ( height < 0 && bitmap.Ok() )
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.
m_hWnd = (WXHWND)CreateWindow
m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon));
#ifdef __WIN32__
// create a static control with either SS_BITMAP or SS_ICON style depending
// on what we have here
const char *classname = "STATIC";
int winstyle = m_isIcon ? SS_ICON : SS_BITMAP;
#else // Win16
const char *classname = "BUTTON";
int winstyle = BS_OWNERDRAWN;
#endif // Win32
m_hWnd = (WXHWND)::CreateWindow
(
"BUTTON",
classname,
"",
BS_OWNERDRAW | WS_TABSTOP | WS_CHILD | WS_VISIBLE,
winstyle | WS_CHILD | WS_VISIBLE,
0, 0, 0, 0,
(HWND)parent->GetHWND(),
(HMENU)m_windowId,
@@ -81,15 +103,40 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
NULL
);
wxCHECK_MSG( m_hWnd, FALSE, "Failed to create static bitmap" );
SetBitmap(bitmap);
// Subclass again for purposes of dialog editing mode
SubclassWin(m_hWnd);
SetFont(GetParent()->GetFont());
SetSize(x, y, width, height);
return TRUE;
}
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;
}
void wxStaticBitmap::Free()
{
if ( m_isIcon )
delete m_image.icon;
else
delete m_image.bitmap;
m_image.icon = NULL;
}
void wxStaticBitmap::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
int currentX, currentY;
@@ -113,52 +160,61 @@ void wxStaticBitmap::DoSetSize(int x, int y, int width, int height, int sizeFlag
// 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;
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;
else
actualHeight = height;
MoveWindow((HWND) GetHWND(), x1, y1, actualWidth, actualHeight, TRUE);
}
void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
{
m_messageBitmap = bitmap;
Free();
m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon));
if ( m_isIcon )
m_image.icon = new wxIcon((const wxIcon&)bitmap);
else
m_image.bitmap = new wxBitmap(bitmap);
int x, y;
int w, h;
GetPosition(&x, &y);
GetSize(&w, &h);
RECT rect;
rect.left = x; rect.top = y; rect.right = x + w; rect.bottom = y + h;
RECT rect = { x, y, x + w, y + h };
if ( bitmap.Ok() )
MoveWindow((HWND) GetHWND(), x, y, bitmap.GetWidth(), bitmap.GetHeight(),
FALSE);
#ifdef __WIN32__
HANDLE handle = m_isIcon ? (HANDLE)m_image.icon->GetHICON()
: (HANDLE)m_image.bitmap->GetHBITMAP();
::SendMessage((HWND)m_hWnd, STM_SETIMAGE,
m_isIcon ? IMAGE_ICON : IMAGE_BITMAP, (LPARAM)handle);
#endif // Win32
if ( ImageIsOk() )
{
int width = bitmap.GetWidth(),
height = bitmap.GetHeight();
if ( width && height )
{
::MoveWindow((HWND)GetHWND(), x, y, width, height, FALSE);
}
}
InvalidateRect((HWND)GetParent()->GetHWND(), &rect, TRUE);
}
// under Win32 we use the standard static control style for this
#ifdef __WIN16__
bool wxStaticBitmap::MSWOnDraw(WXDRAWITEMSTRUCT *item)
{
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;
wxBitmap* bitmap = m_image.bitmap;
if ( !bitmap->Ok() )
return FALSE;
@@ -188,7 +244,9 @@ bool wxStaticBitmap::MSWOnDraw(WXDRAWITEMSTRUCT *item)
return TRUE;
}
long wxStaticBitmap::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
long wxStaticBitmap::MSWWindowProc(WXUINT nMsg,
WXWPARAM wParam,
WXLPARAM lParam)
{
// Ensure that static items get messages. Some controls don't like this
// message to be intercepted (e.g. RichEdit), hence the tests.
@@ -197,4 +255,4 @@ long wxStaticBitmap::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam
return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
}
#endif // Win16