#include "wx/statbmp.h"
#endif
+#include "wx/sysopt.h"
+
#include <stdio.h>
// ---------------------------------------------------------------------------
wxFLAGS_MEMBER(wxBORDER_RAISED)
wxFLAGS_MEMBER(wxBORDER_STATIC)
wxFLAGS_MEMBER(wxBORDER_NONE)
-
+
// old style border flags
wxFLAGS_MEMBER(wxSIMPLE_BORDER)
wxFLAGS_MEMBER(wxSUNKEN_BORDER)
wxFLAGS_MEMBER(wxDOUBLE_BORDER)
wxFLAGS_MEMBER(wxRAISED_BORDER)
wxFLAGS_MEMBER(wxSTATIC_BORDER)
- wxFLAGS_MEMBER(wxNO_BORDER)
+ wxFLAGS_MEMBER(wxBORDER)
// standard window styles
wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
wxFLAGS_MEMBER(wxCLIP_CHILDREN)
wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
wxFLAGS_MEMBER(wxWANTS_CHARS)
- wxFLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
+ wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
wxFLAGS_MEMBER(wxVSCROLL)
wxFLAGS_MEMBER(wxHSCROLL)
IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBitmap, wxControl,"wx/statbmp.h")
wxBEGIN_PROPERTIES_TABLE(wxStaticBitmap)
- wxPROPERTY_FLAGS( WindowStyle , wxStaticBitmapStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+ wxPROPERTY_FLAGS( WindowStyle , wxStaticBitmapStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
wxEND_PROPERTIES_TABLE()
wxBEGIN_HANDLERS_TABLE(wxStaticBitmap)
#endif
/*
- TODO PROPERTIES :
- bitmap
+ TODO PROPERTIES :
+ bitmap
*/
// ===========================================================================
// note that this function will create a new object every time
// it is called even if the image needs no conversion
-#ifndef __WIN16__
-
static wxGDIImage* ConvertImage( const wxGDIImage& bitmap )
{
bool isIcon = bitmap.IsKindOf( CLASSINFO(wxIcon) );
return new wxIcon( (const wxIcon&)bitmap );
}
-#endif
-
bool wxStaticBitmap::Create(wxWindow *parent,
wxWindowID id,
const wxGDIImage& bitmap,
const wxString& name)
{
if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
- return FALSE;
+ return false;
// 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
- wxGDIImage *image = (wxGDIImage *)NULL;
m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon));
-#ifdef __WIN16__
- wxASSERT_MSG( !m_isIcon, "Icons are not supported in wxStaticBitmap under WIN16." );
- image = &bitmap;
-#else // Win32
- image = ConvertImage( bitmap );
+ wxGDIImage *image = ConvertImage( bitmap );
m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) );
-#endif // Win16/32
// create the native control
- if ( !MSWCreateControl(
-#ifdef __WIN32__
- _T("STATIC"),
-#else // Win16
- _T("BUTTON"),
-#endif // Win32/16
- wxEmptyString, pos, size) )
+ if ( !MSWCreateControl(_T("STATIC"), wxEmptyString, pos, size) )
{
// control creation failed
- return FALSE;
+ return false;
}
// no need to delete the new image
SetImageNoCopy(image);
- return TRUE;
+ // GetBestSize will work properly now, so set the best size if needed
+ SetBestSize(size);
+
+ return true;
}
wxBorder wxStaticBitmap::GetDefaultBorder() const
{
WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
-#ifdef __WIN32__
// what kind of control are we?
msStyle |= m_isIcon ? SS_ICON : SS_BITMAP;
// we use SS_CENTERIMAGE to prevent the control from resizing the bitmap to
// fit to its size -- this is unexpected and doesn't happen in other ports
msStyle |= SS_CENTERIMAGE;
-#else // Win16
- msStyle |= BS_OWNERDRAW;
-#endif // Win32/16
return msStyle;
}
wxSize wxStaticBitmap::DoGetBestSize() const
{
- // reuse the current size (as wxWindow does) instead of using some
- // arbitrary default size (as wxControl, our immediate base class, does)
- return wxWindow::DoGetBestSize();
+ if ( ImageIsOk() )
+ {
+ wxSize best(m_image->GetWidth(), m_image->GetHeight());
+ CacheBestSize(best);
+ return best;
+ }
+
+ // this is completely arbitrary
+ return wxSize(16, 16);
}
void wxStaticBitmap::SetImage( const wxGDIImage* image )
{
wxGDIImage* convertedImage = ConvertImage( *image );
SetImageNoCopy( convertedImage );
+ InvalidateBestSize();
}
void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
rect.top = y;
rect.right = x + w;
rect.bottom = y + h;
- InvalidateRect(GetHwndOf(GetParent()), &rect, TRUE);
+ ::InvalidateRect(GetHwndOf(GetParent()), &rect, TRUE);
}
-// under Win32 we use the standard static control style for this
-#ifdef __WIN16__
-bool wxStaticBitmap::MSWOnDraw(WXDRAWITEMSTRUCT *item)
-{
- LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT) item;
-
- wxCHECK_MSG( !m_isIcon, FALSE, _T("icons not supported in wxStaticBitmap") );
-
- wxBitmap* bitmap = (wxBitmap *)m_image;
- if ( !bitmap->Ok() )
- return FALSE;
-
- HDC hDC = lpDIS->hDC;
- HDC memDC = ::CreateCompatibleDC(hDC);
-
- HBITMAP old = (HBITMAP) ::SelectObject(memDC, (HBITMAP) bitmap->GetHBITMAP());
-
- 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));
-
- ::BitBlt(hDC, x1, y1, bitmap->GetWidth(), bitmap->GetHeight(), memDC, 0, 0, SRCCOPY);
-
- ::SelectObject(memDC, old);
-
- ::DeleteDC(memDC);
-
- return TRUE;
-}
-#endif // Win16
-
-// We need this or the control can never be moved e.g. in Dialog Editor.
-long wxStaticBitmap::MSWWindowProc(WXUINT nMsg,
+WXLRESULT wxStaticBitmap::MSWWindowProc(WXUINT nMsg,
WXWPARAM wParam,
WXLPARAM lParam)
{
#ifndef __WXWINCE__
- // Ensure that static items get messages. Some controls don't like this
- // message to be intercepted (e.g. RichEdit), hence the tests.
- if ( nMsg == WM_NCHITTEST )
- return (long)HTCLIENT;
+ static int s_useHTClient = -1;
+ if (s_useHTClient == -1)
+ s_useHTClient = wxSystemOptions::GetOptionInt(wxT("msw.staticbitmap.htclient"));
+ if (s_useHTClient == 1)
+ {
+ // Ensure that static items get messages. Some controls don't like this
+ // message to be intercepted (e.g. RichEdit), hence the tests.
+ // Also, this code breaks some other processing such as enter/leave tracking
+ // so it's off by default.
+
+ if ( nMsg == WM_NCHITTEST )
+ return (long)HTCLIENT;
+ }
#endif
return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
}
#endif // wxUSE_STATBMP
+
projects / wxWidgets.git / blobdiff