// Purpose: wxAnyButton
// Author: Julian Smart
// Created: 1998-01-04 (extracted from button.cpp)
-// RCS-ID: $Id: anybutton.cpp 67384 2011-04-03 20:31:32Z DS $
+// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
wxODButtonImageData(wxAnyButton *btn, const wxBitmap& bitmap)
{
SetBitmap(bitmap, wxAnyButton::State_Normal);
+#if wxUSE_IMAGE
SetBitmap(bitmap.ConvertToDisabled(), wxAnyButton::State_Disabled);
-
+#endif
m_dir = wxLEFT;
// we use margins when we have both bitmap and text, but when we have
// the image list
wxXPButtonImageData(wxAnyButton *btn, const wxBitmap& bitmap)
: m_iml(bitmap.GetWidth(), bitmap.GetHeight(), true /* use mask */,
- wxAnyButton::State_Max),
+ wxAnyButton::State_Max + 1 /* see "pulse" comment below */),
m_hwndBtn(GetHwndOf(btn))
{
// initialize all bitmaps except for the disabled one to normal state
for ( int n = 0; n < wxAnyButton::State_Max; n++ )
{
+#if wxUSE_IMAGE
m_iml.Add(n == wxAnyButton::State_Disabled ? bitmap.ConvertToDisabled()
: bitmap);
+#else
+ m_iml.Add(bitmap);
+#endif
}
+ // In addition to the states supported by wxWidgets such as normal,
+ // hot, pressed, disabled and focused, we need to add bitmap for
+ // another state when running under Windows 7 -- the so called "stylus
+ // hot" state corresponding to PBS_STYLUSHOT constant. While it's
+ // documented in MSDN as being only used with tablets, it is a lie as
+ // a focused button actually alternates between the image list elements
+ // with PBS_DEFAULTED and PBS_STYLUSHOT indices and, in particular,
+ // just disappears during half of the time if the latter is not set so
+ // we absolutely must set it.
+ //
+ // This also explains why we need to allocate an extra slot in the
+ // image list ctor above, the slot State_Max is used for this one.
+ m_iml.Add(bitmap);
+
m_data.himl = GetHimagelistOf(&m_iml);
// no margins by default
{
m_iml.Replace(which, bitmap);
+ // As we want the focused button to always show its bitmap, we need to
+ // update the "stylus hot" one to match it to avoid any pulsing.
+ if ( which == wxAnyButton::State_Focused )
+ m_iml.Replace(wxAnyButton::State_Max, bitmap);
+
UpdateImageInfo();
}
{
// We still need some margin or the text would be overwritten, just
// make it as small as possible.
- sizeBtn.x += (3*win->GetCharWidth())/2;
+ sizeBtn.x += (3*win->GetCharWidth());
}
else
{
{
wxSize sizeBtn(size);
- // All buttons have at least the standard height and, unless the user
- // explicitly wants them to be as small as possible and used wxBU_EXACTFIT
- // style to indicate this, of at least the standard width too.
- //
- // Notice that we really want to make all buttons equally high, otherwise
- // they look ugly and the existing code using wxBU_EXACTFIT only uses it to
- // control width and not height.
-
// The 50x14 button size is documented in the "Recommended sizing and
// spacing" section of MSDN layout article.
//
// Note that we intentionally don't use GetDefaultSize() here, because
// it's inexact -- dialog units depend on this dialog's font.
const wxSize sizeDef = btn->ConvertDialogToPixels(wxSize(50, 14));
- if ( !btn->HasFlag(wxBU_EXACTFIT) )
+
+ // All buttons should have at least the standard size, unless the user
+ // explicitly wants them to be as small as possible and used wxBU_EXACTFIT
+ // style to indicate this.
+ const bool incToStdSize = !btn->HasFlag(wxBU_EXACTFIT);
+ if ( incToStdSize )
{
if ( sizeBtn.x < sizeDef.x )
sizeBtn.x = sizeDef.x;
}
- if ( sizeBtn.y < sizeDef.y )
- sizeBtn.y = sizeDef.y;
+
+ // Notice that we really want to make all buttons with text label equally
+ // high, otherwise they look ugly and the existing code using wxBU_EXACTFIT
+ // only uses it to control width and not height.
+ if ( incToStdSize || !btn->GetLabel().empty() )
+ {
+ if ( sizeBtn.y < sizeDef.y )
+ sizeBtn.y = sizeDef.y;
+ }
btn->CacheBestSize(sizeBtn);
if ( m_imageData &&
bitmap.GetSize() != m_imageData->GetBitmap(State_Normal).GetSize() )
{
- wxASSERT_MSG( which == State_Normal,
+ wxASSERT_MSG( (which == State_Normal) || bitmap.IsNull(),
"Must set normal bitmap with the new size first" );
#if wxUSE_UXTHEME
// first we need to compute its bounding rect
RECT rc;
::CopyRect(&rc, pRect);
- ::DrawText(hdc, text.wx_str(), text.length(), &rc,
+ ::DrawText(hdc, text.t_str(), text.length(), &rc,
DT_CENTER | DT_CALCRECT);
// now center this rect inside the entire button area
const LONG w = rc.right - rc.left;
const LONG h = rc.bottom - rc.top;
- rc.left = (pRect->right - pRect->left)/2 - w/2;
+ rc.left = pRect->left + (pRect->right - pRect->left)/2 - w/2;
rc.right = rc.left+w;
- rc.top = (pRect->bottom - pRect->top)/2 - h/2;
+ rc.top = pRect->top + (pRect->bottom - pRect->top)/2 - h/2;
rc.bottom = rc.top+h;
- ::DrawText(hdc, text.wx_str(), text.length(), &rc, flags);
+ ::DrawText(hdc, text.t_str(), text.length(), &rc, flags);
}
else // single line label
{
// notice that we must have DT_SINGLELINE for vertical alignment flags
// to work
- ::DrawText(hdc, text.wx_str(), text.length(), pRect,
+ ::DrawText(hdc, text.t_str(), text.length(), pRect,
flags | DT_SINGLELINE );
}
}
projects / wxWidgets.git / blobdiff