#include "wx/dcscreen.h"
#include "wx/dcclient.h"
#include "wx/toplevel.h"
- #include "wx/imaglist.h"
+ #include "wx/msw/wrapcctl.h"
+ #include "wx/msw/private.h"
+ #include "wx/msw/missing.h"
#endif
+#include "wx/imaglist.h"
#include "wx/stockitem.h"
-#include "wx/msw/private.h"
#include "wx/msw/private/button.h"
#include "wx/msw/private/dc.h"
+#include "wx/private/window.h"
using namespace wxMSWImpl;
#define DT_HIDEPREFIX 0x00100000
#endif
+// set the value for BCM_SETSHIELD (for the UAC shield) if it's not defined in
+// the header
+#ifndef BCM_SETSHIELD
+ #define BCM_SETSHIELD 0x160c
+#endif
+
// ----------------------------------------------------------------------------
// button image data
// ----------------------------------------------------------------------------
{
public:
wxButtonImageData() { }
+ virtual ~wxButtonImageData() { }
virtual wxBitmap GetBitmap(wxButton::State which) const = 0;
virtual void SetBitmap(const wxBitmap& bitmap, wxButton::State which) = 0;
virtual wxSize GetBitmapMargins() const = 0;
virtual void SetBitmapMargins(wxCoord x, wxCoord y) = 0;
- virtual bool IsHorizontal() const = 0;
+ virtual wxDirection GetBitmapPosition() const = 0;
virtual void SetBitmapPosition(wxDirection dir) = 0;
private:
namespace
{
+// the gap between button edge and the interior area used by Windows for the
+// standard buttons
+const int OD_BUTTON_MARGIN = 4;
+
class wxODButtonImageData : public wxButtonImageData
{
public:
- wxODButtonImageData() { m_dir = wxLEFT; }
+ wxODButtonImageData(wxButton *btn, const wxBitmap& bitmap)
+ {
+ SetBitmap(bitmap, wxButton::State_Normal);
+
+ m_dir = wxLEFT;
+
+ // we use margins when we have both bitmap and text, but when we have
+ // only the bitmap it should take up the entire button area
+ if ( btn->ShowsLabel() )
+ {
+ m_margin.x = btn->GetCharWidth();
+ m_margin.y = btn->GetCharHeight() / 2;
+ }
+ }
virtual wxBitmap GetBitmap(wxButton::State which) const
{
m_margin = wxSize(x, y);
}
- virtual bool IsHorizontal() const
+ virtual wxDirection GetBitmapPosition() const
{
- return m_dir == wxLEFT || m_dir == wxRIGHT;
+ return m_dir;
}
virtual void SetBitmapPosition(wxDirection dir)
#if wxUSE_UXTHEME
+// somehow the margin is one pixel greater than the value returned by
+// GetThemeMargins() call
+const int XP_BUTTON_EXTRA_MARGIN = 1;
+
class wxXPButtonImageData : public wxButtonImageData
{
public:
// we must be constructed with the size of our images as we need to create
// the image list
- wxXPButtonImageData(wxButton *btn, const wxSize& size)
- : m_iml(size.x, size.y, true /* use mask */, wxButton::State_Max),
+ wxXPButtonImageData(wxButton *btn, const wxBitmap& bitmap)
+ : m_iml(bitmap.GetWidth(), bitmap.GetHeight(), true /* use mask */,
+ wxButton::State_Max),
m_hwndBtn(GetHwndOf(btn))
{
+ // initialize all bitmaps to normal state
+ for ( int n = 0; n < wxButton::State_Max; n++ )
+ {
+ m_iml.Add(bitmap);
+ }
+
m_data.himl = GetHimagelistOf(&m_iml);
// use default margins
// and default alignment
m_data.uAlign = BUTTON_IMAGELIST_ALIGN_LEFT;
+
+ UpdateImageInfo();
}
virtual wxBitmap GetBitmap(wxButton::State which) const
virtual void SetBitmap(const wxBitmap& bitmap, wxButton::State which)
{
- const int imagesToAdd = which - m_iml.GetImageCount();
- if ( imagesToAdd >= 0 )
- {
- if ( imagesToAdd > 0 )
- {
- const wxBitmap bmpNormal = GetBitmap(wxButton::State_Normal);
- for ( int n = 0; n < imagesToAdd; n++ )
- m_iml.Add(bmpNormal);
- }
-
- m_iml.Add(bitmap);
- }
- else // we already have this bitmap
- {
- m_iml.Replace(which, bitmap);
- }
+ m_iml.Replace(which, bitmap);
UpdateImageInfo();
}
}
}
- virtual bool IsHorizontal() const
+ virtual wxDirection GetBitmapPosition() const
{
- return m_data.uAlign == BUTTON_IMAGELIST_ALIGN_LEFT ||
- m_data.uAlign == BUTTON_IMAGELIST_ALIGN_RIGHT;
+ switch ( m_data.uAlign )
+ {
+ default:
+ wxFAIL_MSG( "invalid image alignment" );
+ // fall through
+
+ case BUTTON_IMAGELIST_ALIGN_LEFT:
+ return wxLEFT;
+
+ case BUTTON_IMAGELIST_ALIGN_RIGHT:
+ return wxRIGHT;
+
+ case BUTTON_IMAGELIST_ALIGN_TOP:
+ return wxTOP;
+
+ case BUTTON_IMAGELIST_ALIGN_BOTTOM:
+ return wxBOTTOM;
+ }
}
virtual void SetBitmapPosition(wxDirection dir)
// macros
// ----------------------------------------------------------------------------
-#if wxUSE_EXTENDED_RTTI
-
-WX_DEFINE_FLAGS( wxButtonStyle )
-
-wxBEGIN_FLAGS( wxButtonStyle )
- // new style border flags, we put them first to
- // use them for streaming out
- wxFLAGS_MEMBER(wxBORDER_SIMPLE)
- wxFLAGS_MEMBER(wxBORDER_SUNKEN)
- wxFLAGS_MEMBER(wxBORDER_DOUBLE)
- 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(wxBORDER)
-
- // standard window styles
- wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
- wxFLAGS_MEMBER(wxCLIP_CHILDREN)
- wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
- wxFLAGS_MEMBER(wxWANTS_CHARS)
- wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
- wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
- wxFLAGS_MEMBER(wxVSCROLL)
- wxFLAGS_MEMBER(wxHSCROLL)
-
- wxFLAGS_MEMBER(wxBU_LEFT)
- wxFLAGS_MEMBER(wxBU_RIGHT)
- wxFLAGS_MEMBER(wxBU_TOP)
- wxFLAGS_MEMBER(wxBU_BOTTOM)
- wxFLAGS_MEMBER(wxBU_EXACTFIT)
-wxEND_FLAGS( wxButtonStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxButton, wxControl,"wx/button.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxButton)
- wxEVENT_PROPERTY( Click , wxEVT_COMMAND_BUTTON_CLICKED , wxCommandEvent)
-
- wxPROPERTY( Font , wxFont , SetFont , GetFont , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY( Label, wxString , SetLabel, GetLabel, wxString(), 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
-
- wxPROPERTY_FLAGS( WindowStyle , wxButtonStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxButton)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxButton , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle )
-
-
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
-#endif
-
// ============================================================================
// implementation
// ============================================================================
// the control unless it already has new lines in its label)
long styleOld = ::GetWindowLong(hwnd, GWL_STYLE),
styleNew;
- if ( label.find(_T('\n')) != wxString::npos )
+ if ( label.find(wxT('\n')) != wxString::npos )
styleNew = styleOld | BS_MULTILINE;
else
styleNew = styleOld & ~BS_MULTILINE;
::SetWindowLong(hwnd, GWL_STYLE, styleNew);
}
-wxSize wxMSWButton::GetFittingSize(wxWindow *win, const wxSize& sizeLabel)
+wxSize wxMSWButton::GetFittingSize(wxWindow *win,
+ const wxSize& sizeLabel,
+ int flags)
{
// FIXME: this is pure guesswork, need to retrieve the real button margins
wxSize sizeBtn = sizeLabel;
sizeBtn.x += 3*win->GetCharWidth();
sizeBtn.y = 11*EDIT_HEIGHT_FROM_CHAR_HEIGHT(sizeLabel.y)/10;
+ // account for the shield UAC icon if we have it
+ if ( flags & Size_AuthNeeded )
+ sizeBtn.x += wxSystemSettings::GetMetric(wxSYS_SMALLICON_X);
+
return sizeBtn;
}
-wxSize wxMSWButton::ComputeBestSize(wxControl *btn)
+wxSize wxMSWButton::ComputeBestSize(wxControl *btn, int flags)
{
wxClientDC dc(btn);
wxSize sizeBtn;
dc.GetMultiLineTextExtent(btn->GetLabelText(), &sizeBtn.x, &sizeBtn.y);
- sizeBtn = GetFittingSize(btn, sizeBtn);
+ sizeBtn = GetFittingSize(btn, sizeBtn, flags);
// all buttons have at least the standard size unless the user explicitly
// wants them to be of smaller size and used wxBU_EXACTFIT style when
// creating the button
if ( !btn->HasFlag(wxBU_EXACTFIT) )
{
- wxSize sizeDef = wxButton::GetDefaultSize();
+ // The size of a standard button in the dialog units is 50x14, use it.
+ // Note that we intentionally don't use GetDefaultSize() here, because
+ // it's inexact -- dialog units depend on this dialog's font.
+ wxSize sizeDef = btn->ConvertDialogToPixels(wxSize(50, 14));
if ( sizeBtn.x < sizeDef.x )
sizeBtn.x = sizeDef.x;
if ( sizeBtn.y < sizeDef.y )
const wxValidator& validator,
const wxString& name)
{
+ m_authNeeded = false;
+
wxString label(lbl);
if (label.empty() && wxIsStockID(id))
{
// value and the label is not set yet when MSWGetStyle() is called
msStyle |= wxMSWButton::GetMultilineStyle(label);
- return MSWCreateControl(_T("BUTTON"), msStyle, pos, size, label, exstyle);
+ return MSWCreateControl(wxT("BUTTON"), msStyle, pos, size, label, exstyle);
}
wxButton::~wxButton()
// size management including autosizing
// ----------------------------------------------------------------------------
-wxSize wxButton::DoGetBestSize() const
+void wxButton::AdjustForBitmapSize(wxSize &size) const
{
- wxSize size = wxMSWButton::ComputeBestSize(const_cast<wxButton *>(this));
- if ( m_imageData )
+ if ( !m_imageData )
+ return;
+
+ // account for the bitmap size
+ const wxSize sizeBmp = m_imageData->GetBitmap(State_Normal).GetSize();
+ const wxDirection dirBmp = m_imageData->GetBitmapPosition();
+ if ( dirBmp == wxLEFT || dirBmp == wxRIGHT )
{
- const wxSize sizeBmp = m_imageData->GetBitmap(State_Normal).GetSize();
- if ( m_imageData->IsHorizontal() )
+ size.x += sizeBmp.x;
+ if ( sizeBmp.y > size.y )
+ size.y = sizeBmp.y;
+ }
+ else // bitmap on top/below the text
+ {
+ size.y += sizeBmp.y;
+ if ( sizeBmp.x > size.x )
+ size.x = sizeBmp.x;
+ }
+
+ // account for the user-specified margins
+ size += 2*m_imageData->GetBitmapMargins();
+
+ // and also for the margins we always add internally (unless we have no
+ // border at all in which case the button has exactly the same size as
+ // bitmap and so no margins should be used)
+ if ( !HasFlag(wxBORDER_NONE) )
+ {
+ int marginH = 0,
+ marginV = 0;
+#if wxUSE_UXTHEME
+ if ( wxUxThemeEngine::GetIfActive() )
{
- size.x += sizeBmp.x;
- if ( sizeBmp.y > size.y )
- size.y = sizeBmp.y;
+ wxUxThemeHandle theme(const_cast<wxButton *>(this), L"BUTTON");
+
+ MARGINS margins;
+ wxUxThemeEngine::Get()->GetThemeMargins(theme, NULL,
+ BP_PUSHBUTTON,
+ PBS_NORMAL,
+ TMT_CONTENTMARGINS,
+ NULL,
+ &margins);
+
+ // XP doesn't draw themed buttons correctly when the client
+ // area is smaller than 8x8 - enforce this minimum size for
+ // small bitmaps
+ size.IncTo(wxSize(8, 8));
+
+ marginH = margins.cxLeftWidth + margins.cxRightWidth
+ + 2*XP_BUTTON_EXTRA_MARGIN;
+ marginV = margins.cyTopHeight + margins.cyBottomHeight
+ + 2*XP_BUTTON_EXTRA_MARGIN;
}
- else // bitmap on top/below the text
+ else
+#endif // wxUSE_UXTHEME
{
- size.y += sizeBmp.y;
- if ( sizeBmp.x > size.x )
- size.x = sizeBmp.x;
+ marginH =
+ marginV = OD_BUTTON_MARGIN;
}
- size += 2*m_imageData->GetBitmapMargins();
+ size.IncBy(marginH, marginV);
+ }
+}
+
+wxSize wxButton::DoGetBestSize() const
+{
+ wxSize size;
+
+ // account for the text part if we have it or if we don't have any image at
+ // all (buttons initially created with empty label should still have a non
+ // zero size)
+ if ( ShowsLabel() || !m_imageData )
+ {
+ int flags = 0;
+ if ( GetAuthNeeded() )
+ flags |= wxMSWButton::Size_AuthNeeded;
+
+ size = wxMSWButton::ComputeBestSize(const_cast<wxButton *>(this), flags);
+ }
+
+ if ( m_imageData )
+ {
+ AdjustForBitmapSize(size);
CacheBestSize(size);
}
wxScreenDC dc;
dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
- // the size of a standard button in the dialog units is 50x14,
- // translate this to pixels
- // NB1: the multipliers come from the Windows convention
- // NB2: the extra +1/+2 were needed to get the size be the same as the
- // size of the buttons in the standard dialog - I don't know how
- // this happens, but on my system this size is 75x23 in pixels and
- // 23*8 isn't even divisible by 14... Would be nice to understand
- // why these constants are needed though!
- s_sizeBtn.x = (50 * (dc.GetCharWidth() + 1))/4;
- s_sizeBtn.y = ((14 * dc.GetCharHeight()) + 2)/8;
+ // The size of a standard button in the dialog units is 50x14,
+ // translate this to pixels.
+ //
+ // Windows' computes dialog units using average character width over
+ // upper- and lower-case ASCII alphabet and not using the average
+ // character width metadata stored in the font; see
+ // http://support.microsoft.com/default.aspx/kb/145994 for detailed
+ // discussion.
+ //
+ // NB: wxMulDivInt32() is used, because it correctly rounds the result
+
+ const wxSize base = wxPrivate::GetAverageASCIILetterSize(dc);
+ s_sizeBtn.x = wxMulDivInt32(50, base.x, 4);
+ s_sizeBtn.y = wxMulDivInt32(14, base.y, 8);
}
return s_sizeBtn;
// ----------------------------------------------------------------------------
/*
+ The comment below and all this code is probably due to not using WM_NEXTDLGCTL
+ message when changing focus (but just SetFocus() which is not enough), see
+ http://blogs.msdn.com/oldnewthing/archive/2004/08/02/205624.aspx for the
+ full explanation.
+
+ TODO: Do use WM_NEXTDLGCTL and get rid of all this code.
+
+
"Everything you ever wanted to know about the default buttons" or "Why do we
have to do all this?"
win = parent;
}
- wxASSERT_MSG( win, _T("button without top level parent?") );
+ wxASSERT_MSG( win, wxT("button without top level parent?") );
wxTopLevelWindow * const tlw = wxDynamicCast(win, wxTopLevelWindow);
- wxASSERT_MSG( tlw, _T("logic error in GetTLWParentIfNotBeingDeleted()") );
+ wxASSERT_MSG( tlw, wxT("logic error in GetTLWParentIfNotBeingDeleted()") );
return tlw;
}
return;
wxWindow * const tlw = wxGetTopLevelParent(btn);
- wxCHECK_RET( tlw, _T("button without top level window?") );
+ wxCHECK_RET( tlw, wxT("button without top level window?") );
::SendMessage(GetHwndOf(tlw), DM_SETDEFID, btn->GetId(), 0L);
// as the theme size might have changed
InvalidateBestSize();
}
- else if ( wxUxThemeEngine::GetIfActive() )
+#endif // wxUSE_UXTHEME
+ // must use m_mouseInWindow here instead of IsMouseInWindow()
+ // since we need to know the first time the mouse enters the window
+ // and IsMouseInWindow() would return true in this case
+ else if ( (nMsg == WM_MOUSEMOVE && !m_mouseInWindow) ||
+ nMsg == WM_MOUSELEAVE )
{
- // we need to Refresh() if mouse has entered or left window
- // so we can update the hot tracking state
- // must use m_mouseInWindow here instead of IsMouseInWindow()
- // since we need to know the first time the mouse enters the window
- // and IsMouseInWindow() would return true in this case
- if ( ( nMsg == WM_MOUSEMOVE && !m_mouseInWindow ) ||
- nMsg == WM_MOUSELEAVE )
+ if (
+ IsEnabled() &&
+ (
+#if wxUSE_UXTHEME
+ wxUxThemeEngine::GetIfActive() ||
+#endif // wxUSE_UXTHEME
+ (m_imageData && m_imageData->GetBitmap(State_Current).IsOk())
+ )
+ )
{
Refresh();
}
}
-#endif // wxUSE_UXTHEME
// let the base class do all real processing
return wxControl::MSWWindowProc(nMsg, wParam, lParam);
}
+// ----------------------------------------------------------------------------
+// authentication needed handling
+// ----------------------------------------------------------------------------
+
+bool wxButton::DoGetAuthNeeded() const
+{
+ return m_authNeeded;
+}
+
+void wxButton::DoSetAuthNeeded(bool show)
+{
+ // show/hide UAC symbol on Windows Vista and later
+ if ( wxGetWinVersion() >= wxWinVersion_6 )
+ {
+ m_authNeeded = show;
+ ::SendMessage(GetHwnd(), BCM_SETSHIELD, 0, show);
+ InvalidateBestSize();
+ }
+}
+
// ----------------------------------------------------------------------------
// button images
// ----------------------------------------------------------------------------
if ( !m_imageData )
{
#if wxUSE_UXTHEME
- if ( wxUxThemeEngine::GetIfActive() )
- m_imageData = new wxXPButtonImageData(this, bitmap.GetSize());
+ // using image list doesn't work correctly if we don't have any label
+ // (even if we use BUTTON_IMAGELIST_ALIGN_CENTER alignment and
+ // BS_BITMAP style), at least under Windows 2003 so use owner drawn
+ // strategy for bitmap-only buttons
+ if ( ShowsLabel() && wxUxThemeEngine::GetIfActive() )
+ {
+ m_imageData = new wxXPButtonImageData(this, bitmap);
+ }
else
#endif // wxUSE_UXTHEME
- m_imageData = new wxODButtonImageData;
+ {
+ m_imageData = new wxODButtonImageData(this, bitmap);
+ MakeOwnerDrawn();
+ }
+ }
+ else
+ {
+ m_imageData->SetBitmap(bitmap, which);
+ }
- // if a bitmap was assigned to the bitmap, its best size must be
- // changed to account for it
+ // it should be enough to only invalidate the best size when the normal
+ // bitmap changes as all bitmaps assigned to the button should be of the
+ // same size anyhow
+ if ( which == State_Normal )
InvalidateBestSize();
- }
- m_imageData->SetBitmap(bitmap, which);
+ Refresh();
+}
+
+wxSize wxButton::DoGetBitmapMargins() const
+{
+ return m_imageData ? m_imageData->GetBitmapMargins() : wxSize(0, 0);
}
void wxButton::DoSetBitmapMargins(wxCoord x, wxCoord y)
wxCHECK_RET( m_imageData, "SetBitmap() must be called first" );
m_imageData->SetBitmapMargins(x, y);
+ InvalidateBestSize();
}
void wxButton::DoSetBitmapPosition(wxDirection dir)
wxCHECK_RET( m_imageData, "SetBitmap() must be called first" );
m_imageData->SetBitmapPosition(dir);
+ InvalidateBestSize();
}
// ----------------------------------------------------------------------------
namespace
{
+// return the button state using both the ODS_XXX flags specified in state
+// parameter and the current button state
+wxButton::State GetButtonState(wxButton *btn, UINT state)
+{
+ if ( state & ODS_DISABLED )
+ return wxButton::State_Disabled;
+
+ if ( state & ODS_SELECTED )
+ return wxButton::State_Pressed;
+
+ if ( btn->HasCapture() || btn->IsMouseInWindow() )
+ return wxButton::State_Current;
+
+ if ( state & ODS_FOCUS )
+ return wxButton::State_Focused;
+
+ return wxButton::State_Normal;
+}
+
void DrawButtonText(HDC hdc,
RECT *pRect,
const wxString& text,
// center text horizontally in any case
flags |= DT_CENTER;
- if ( text.find(_T('\n')) != wxString::npos )
+ if ( text.find(wxT('\n')) != wxString::npos )
{
// draw multiline label
BGGGGGGGGGGGGGGGGGB
BBBBBBBBBBBBBBBBBBB
*/
-void DrawButtonFrame(HDC hdc, const RECT& rectBtn,
+void DrawButtonFrame(HDC hdc, RECT& rectBtn,
bool selected, bool pushed)
{
RECT r;
wxDrawLine(hdc, r.left + 1, r.bottom - 1, r.right - 1, r.bottom - 1);
wxDrawLine(hdc, r.right - 1, r.bottom - 1, r.right - 1, r.top);
}
+
+ InflateRect(&rectBtn, -OD_BUTTON_MARGIN, -OD_BUTTON_MARGIN);
}
#if wxUSE_UXTHEME
-void MSWDrawXPBackground(wxButton *button, WXDRAWITEMSTRUCT *wxdis)
+void DrawXPBackground(wxButton *button, HDC hdc, RECT& rectBtn, UINT state)
{
- LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT)wxdis;
- HDC hdc = lpDIS->hDC;
- UINT state = lpDIS->itemState;
- RECT rectBtn;
- CopyRect(&rectBtn, &lpDIS->rcItem);
-
wxUxThemeHandle theme(button, L"BUTTON");
- int iState;
- if ( state & ODS_SELECTED )
+ // this array is indexed by wxButton::State values and so must be kept in
+ // sync with it
+ static const int uxStates[] =
{
- iState = PBS_PRESSED;
- }
- else if ( button->HasCapture() || button->IsMouseInWindow() )
- {
- iState = PBS_HOT;
- }
- else if ( state & ODS_FOCUS )
- {
- iState = PBS_DEFAULTED;
- }
- else if ( state & ODS_DISABLED )
- {
- iState = PBS_DISABLED;
- }
- else
- {
- iState = PBS_NORMAL;
- }
+ PBS_NORMAL, PBS_HOT, PBS_PRESSED, PBS_DISABLED, PBS_DEFAULTED
+ };
+
+ int iState = uxStates[GetButtonState(button, state)];
+
+ wxUxThemeEngine * const engine = wxUxThemeEngine::Get();
// draw parent background if needed
- if ( wxUxThemeEngine::Get()->IsThemeBackgroundPartiallyTransparent(theme,
- BP_PUSHBUTTON,
- iState) )
+ if ( engine->IsThemeBackgroundPartiallyTransparent
+ (
+ theme,
+ BP_PUSHBUTTON,
+ iState
+ ) )
{
- wxUxThemeEngine::Get()->DrawThemeParentBackground(GetHwndOf(button), hdc, &rectBtn);
+ engine->DrawThemeParentBackground(GetHwndOf(button), hdc, &rectBtn);
}
// draw background
- wxUxThemeEngine::Get()->DrawThemeBackground(theme, hdc, BP_PUSHBUTTON, iState,
- &rectBtn, NULL);
+ engine->DrawThemeBackground(theme, hdc, BP_PUSHBUTTON, iState,
+ &rectBtn, NULL);
// calculate content area margins
MARGINS margins;
- wxUxThemeEngine::Get()->GetThemeMargins(theme, hdc, BP_PUSHBUTTON, iState,
- TMT_CONTENTMARGINS, &rectBtn, &margins);
- RECT rectClient;
- ::CopyRect(&rectClient, &rectBtn);
- ::InflateRect(&rectClient, -margins.cxLeftWidth, -margins.cyTopHeight);
-
- // if focused and !nofocus rect
- if ( (state & ODS_FOCUS) && !(state & ODS_NOFOCUSRECT) )
- {
- DrawFocusRect(hdc, &rectClient);
- }
+ engine->GetThemeMargins(theme, hdc, BP_PUSHBUTTON, iState,
+ TMT_CONTENTMARGINS, &rectBtn, &margins);
+ ::InflateRect(&rectBtn, -margins.cxLeftWidth, -margins.cyTopHeight);
+ ::InflateRect(&rectBtn, -XP_BUTTON_EXTRA_MARGIN, -XP_BUTTON_EXTRA_MARGIN);
if ( button->UseBgCol() )
{
AutoHBRUSH hbrushBackground(colBg);
// don't overwrite the focus rect
+ RECT rectClient;
+ ::CopyRect(&rectClient, &rectBtn);
::InflateRect(&rectClient, -1, -1);
FillRect(hdc, &rectClient, hbrushBackground);
}
{
LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT)wxdis;
HDC hdc = lpDIS->hDC;
+
UINT state = lpDIS->itemState;
+ bool pushed = (SendMessage(GetHwnd(), BM_GETSTATE, 0, 0) & BST_PUSHED) != 0;
+
RECT rectBtn;
CopyRect(&rectBtn, &lpDIS->rcItem);
-#if wxUSE_UXTHEME
- if ( wxUxThemeEngine::GetIfActive() )
+ // draw the button background
+ if ( !HasFlag(wxBORDER_NONE) )
{
- MSWDrawXPBackground(this, wxdis);
- }
- else
+#if wxUSE_UXTHEME
+ if ( wxUxThemeEngine::GetIfActive() )
+ {
+ DrawXPBackground(this, hdc, rectBtn, state);
+ }
+ else
#endif // wxUSE_UXTHEME
- {
- COLORREF colBg = wxColourToRGB(GetBackgroundColour());
+ {
+ COLORREF colBg = wxColourToRGB(GetBackgroundColour());
- // first, draw the background
- AutoHBRUSH hbrushBackground(colBg);
- FillRect(hdc, &rectBtn, hbrushBackground);
+ // first, draw the background
+ AutoHBRUSH hbrushBackground(colBg);
+ FillRect(hdc, &rectBtn, hbrushBackground);
- // draw the border for the current state
- bool selected = (state & ODS_SELECTED) != 0;
- if ( !selected )
- {
- wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
- if ( tlw )
+ // draw the border for the current state
+ bool selected = (state & ODS_SELECTED) != 0;
+ if ( !selected )
{
- selected = tlw->GetDefaultItem() == this;
+ wxTopLevelWindow *
+ tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
+ if ( tlw )
+ {
+ selected = tlw->GetDefaultItem() == this;
+ }
}
- }
- bool pushed = (SendMessage(GetHwnd(), BM_GETSTATE, 0, 0) & BST_PUSHED) != 0;
- DrawButtonFrame(hdc, rectBtn, selected, pushed);
+ DrawButtonFrame(hdc, rectBtn, selected, pushed);
+ }
- // if focused and !nofocus rect
+ // draw the focus rectangle if we need it
if ( (state & ODS_FOCUS) && !(state & ODS_NOFOCUSRECT) )
{
- RECT rectFocus;
- CopyRect(&rectFocus, &rectBtn);
+ DrawFocusRect(hdc, &rectBtn);
- // I don't know where does this constant come from, but this is how
- // Windows draws them
- InflateRect(&rectFocus, -4, -4);
-
- DrawFocusRect(hdc, &rectFocus);
+#if wxUSE_UXTHEME
+ if ( !wxUxThemeEngine::GetIfActive() )
+#endif // wxUSE_UXTHEME
+ {
+ if ( pushed )
+ {
+ // the label is shifted by 1 pixel to create "pushed" effect
+ OffsetRect(&rectBtn, 1, 1);
+ }
+ }
}
+ }
- if ( pushed )
+
+ // draw the image, if any
+ if ( m_imageData )
+ {
+ wxBitmap bmp = m_imageData->GetBitmap(GetButtonState(this, state));
+ if ( !bmp.IsOk() )
+ bmp = m_imageData->GetBitmap(State_Normal);
+
+ const wxSize sizeBmp = bmp.GetSize();
+ const wxSize margin = m_imageData->GetBitmapMargins();
+ const wxSize sizeBmpWithMargins(sizeBmp + 2*margin);
+ wxRect rectButton(wxRectFromRECT(rectBtn));
+
+ // for simplicity, we start with centred rectangle and then move it to
+ // the appropriate edge
+ wxRect rectBitmap = wxRect(sizeBmp).CentreIn(rectButton);
+
+ // move bitmap only if we have a label, otherwise keep it centered
+ if ( ShowsLabel() )
{
- // the label is shifted by 1 pixel to create "pushed" effect
- OffsetRect(&rectBtn, 1, 1);
+ switch ( m_imageData->GetBitmapPosition() )
+ {
+ default:
+ wxFAIL_MSG( "invalid direction" );
+ // fall through
+
+ case wxLEFT:
+ rectBitmap.x = rectButton.x + margin.x;
+ rectButton.x += sizeBmpWithMargins.x;
+ rectButton.width -= sizeBmpWithMargins.x;
+ break;
+
+ case wxRIGHT:
+ rectBitmap.x = rectButton.GetRight() - sizeBmp.x - margin.x;
+ rectButton.width -= sizeBmpWithMargins.x;
+ break;
+
+ case wxTOP:
+ rectBitmap.y = rectButton.y + margin.y;
+ rectButton.y += sizeBmpWithMargins.y;
+ rectButton.height -= sizeBmpWithMargins.y;
+ break;
+
+ case wxBOTTOM:
+ rectBitmap.y = rectButton.GetBottom() - sizeBmp.y - margin.y;
+ rectButton.height -= sizeBmpWithMargins.y;
+ break;
+ }
}
+
+ wxDCTemp dst((WXHDC)hdc);
+ dst.DrawBitmap(bmp, rectBitmap.GetPosition(), true);
+
+ wxCopyRectToRECT(rectButton, rectBtn);
}
- COLORREF colFg = state & ODS_DISABLED
- ? ::GetSysColor(COLOR_GRAYTEXT)
- : wxColourToRGB(GetForegroundColour());
- // notice that DT_HIDEPREFIX doesn't work on old (pre-Windows 2000) systems
- // but by happy coincidence ODS_NOACCEL is not used under them neither so
- // DT_HIDEPREFIX should never be used there
- DrawButtonText(hdc, &rectBtn, GetLabel(), colFg,
- state & ODS_NOACCEL ? DT_HIDEPREFIX : 0);
+ // finally draw the label
+ if ( ShowsLabel() )
+ {
+ COLORREF colFg = state & ODS_DISABLED
+ ? ::GetSysColor(COLOR_GRAYTEXT)
+ : wxColourToRGB(GetForegroundColour());
+
+ // notice that DT_HIDEPREFIX doesn't work on old (pre-Windows 2000)
+ // systems but by happy coincidence ODS_NOACCEL is not used under them
+ // neither so DT_HIDEPREFIX should never be used there
+ DrawButtonText(hdc, &rectBtn, GetLabel(), colFg,
+ state & ODS_NOACCEL ? DT_HIDEPREFIX : 0);
+ }
return true;
}
projects / wxWidgets.git / blobdiff