#pragma hdrstop
#endif
+#if wxUSE_BUTTON
+
#ifndef WX_PRECOMP
#include "wx/button.h"
#include "wx/brush.h"
m_backgroundColour = parent->GetBackgroundColour();
m_foregroundColour = parent->GetForegroundColour();
+ long msStyle = WS_VISIBLE | WS_TABSTOP | WS_CHILD /* | WS_CLIPSIBLINGS */ ;
+
+ if ( m_windowStyle & wxCLIP_SIBLINGS )
+ msStyle |= WS_CLIPSIBLINGS;
+
+#ifdef __WIN32__
+ if(m_windowStyle & wxBU_LEFT)
+ msStyle |= BS_LEFT;
+ if(m_windowStyle & wxBU_RIGHT)
+ msStyle |= BS_RIGHT;
+ if(m_windowStyle & wxBU_TOP)
+ msStyle |= BS_TOP;
+ if(m_windowStyle & wxBU_BOTTOM)
+ msStyle |= BS_BOTTOM;
+#endif
m_hWnd = (WXHWND)CreateWindowEx
(
MakeExtendedStyle(m_windowStyle),
wxT("BUTTON"),
label,
- WS_VISIBLE | WS_TABSTOP | WS_CHILD,
+ msStyle,
0, 0, 0, 0,
GetWinHwnd(parent),
(HMENU)m_windowId,
NULL
);
+ if (m_hWnd == 0)
+ {
+ wxString msg;
+#ifdef __WIN16__
+ msg.Printf(wxT("CreateWindowEx failed"));
+#else
+ msg.Printf(wxT("CreateWindowEx failed with error number %ld"), (long) GetLastError());
+#endif
+ wxFAIL_MSG(msg);
+ }
+
// Subclass again for purposes of dialog editing mode
SubclassWin(m_hWnd);
SetSize(pos.x, pos.y, size.x, size.y);
- // bad hack added by Robert to make buttons at least
- // 80 pixels wide. There are probably better ways...
- // TODO. FIXME.
- wxSize nsize( GetSize() );
- if ((nsize.x < 80) || (nsize.y < 23))
- {
- if ((size.x == -1) && (nsize.x < 80))
- nsize.x = 80;
- if ((size.y == -1) && (nsize.y < 23))
- nsize.y = 23;
- SetSize( nsize );
- }
-
return TRUE;
}
wxButton::~wxButton()
{
- wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
- if ( panel )
- {
- if ( panel->GetDefaultItem() == this )
- {
- // don't leave the panel with invalid default item
- panel->SetDefaultItem(NULL);
- }
- }
}
// ----------------------------------------------------------------------------
// the button height is proportional to the height of the font used
int hBtn = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(hChar);
- return wxSize(wBtn, hBtn);
+ wxSize sz = GetDefaultSize();
+ if (wBtn > sz.x) sz.x = wBtn;
+ if (hBtn > sz.y) sz.y = hBtn;
+
+ return sz;
}
/* static */
-wxSize wxButton::GetDefaultSize()
+wxSize wxButtonBase::GetDefaultSize()
{
static wxSize s_sizeBtn;
if ( s_sizeBtn.x == 0 )
{
wxScreenDC dc;
- dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
// the size of a standard button in the dialog units is 50x14,
// translate this to pixels
void wxButton::SetDefault()
{
wxWindow *parent = GetParent();
- wxButton *btnOldDefault = NULL;
- wxPanel *panel = wxDynamicCast(parent, wxPanel);
- if ( panel )
+ wxButton *btnOldDefault;
+ if ( parent )
{
- btnOldDefault = panel->GetDefaultItem();
- panel->SetDefaultItem(this);
- }
+ wxWindow *winOldDefault = parent->SetDefaultItem(this);
+ btnOldDefault = wxDynamicCast(winOldDefault, wxButton);
- if ( parent )
+ ::SendMessage(GetWinHwnd(parent), DM_SETDEFID, m_windowId, 0L);
+ }
+ else // is a button without parent really normal?
{
- SendMessage(GetWinHwnd(parent), DM_SETDEFID, m_windowId, 0L);
+ btnOldDefault = NULL;
}
- if ( btnOldDefault )
+ if ( btnOldDefault && btnOldDefault != this )
{
// remove the BS_DEFPUSHBUTTON style from the other button
long style = GetWindowLong(GetHwndOf(btnOldDefault), GWL_STYLE);
// event/message handlers
// ----------------------------------------------------------------------------
-bool wxButton::MSWCommand(WXUINT param, WXWORD id)
+bool wxButton::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
{
bool processed = FALSE;
switch ( param )
{
- case 1: // means that the message came from an accelerator
- case BN_CLICKED:
+ case 1: // message came from an accelerator
+ case BN_CLICKED: // normal buttons send this
+ case BN_DOUBLECLICKED: // owner-drawn ones also send this
processed = SendClickEvent();
break;
}
// let the default processign take place too
}
+ else if ( nMsg == WM_LBUTTONDBLCLK )
+ {
+ // emulate a click event to force an owner-drawn button to change its
+ // appearance - without this, it won't do it
+ (void)wxControl::MSWWindowProc(WM_LBUTTONDOWN, wParam, lParam);
+
+ // and conitnue with processing the message normally as well
+ }
// let the base class do all real processing
return wxControl::MSWWindowProc(nMsg, wParam, lParam);
void wxButton::MakeOwnerDrawn()
{
long style = GetWindowLong(GetHwnd(), GWL_STYLE);
- if ( !(style & BS_OWNERDRAW) )
+ if ( (style & BS_OWNERDRAW) != BS_OWNERDRAW )
{
// make it so
style |= BS_OWNERDRAW;
The button frame looks like this normally:
WWWWWWWWWWWWWWWWWWB
- W GB
- W GB
- W GB where W, G, B are white, grey and black pixels
- W GB
+ WHHHHHHHHHHHHHHHHGB W = white (HILIGHT)
+ WH GB H = light grey (LIGHT)
+ WH GB G = dark grey (SHADOW)
+ WH GB B = black (DKSHADOW)
+ WH GB
WGGGGGGGGGGGGGGGGGB
BBBBBBBBBBBBBBBBBBB
BBBBBBBBBBBBBBBBBBB
BWWWWWWWWWWWWWWWWBB
- BW GBB
- BW GBB
+ BWHHHHHHHHHHHHHHGBB
+ BWH GBB
+ BWH GBB
BWGGGGGGGGGGGGGGGBB
BBBBBBBBBBBBBBBBBBB
BBBBBBBBBBBBBBBBBBB
BG GB
BG GB
BG GB
+ BG GB
BGGGGGGGGGGGGGGGGGB
BBBBBBBBBBBBBBBBBBB
*/
RECT r;
CopyRect(&r, &rectBtn);
- HPEN hpenBlack = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DDKSHADOW)),
- hpenGrey = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DSHADOW)),
- hpenWhite = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DHILIGHT));
+ HPEN hpenBlack = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DDKSHADOW)),
+ hpenGrey = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DSHADOW)),
+ hpenLightGr = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DLIGHT)),
+ hpenWhite = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DHILIGHT));
HPEN hpenOld = (HPEN)SelectObject(hdc, hpenBlack);
LineTo(hdc, r.left, r.top);
LineTo(hdc, r.right, r.top);
+ (void)SelectObject(hdc, hpenLightGr);
+ MoveToEx(hdc, r.left + 1, r.bottom - 2, NULL);
+ LineTo(hdc, r.left + 1, r.top + 1);
+ LineTo(hdc, r.right - 1, r.top + 1);
+
(void)SelectObject(hdc, hpenGrey);
MoveToEx(hdc, r.left + 1, r.bottom - 1, NULL);
LineTo(hdc, r.right - 1, r.bottom - 1);
(void)SelectObject(hdc, hpenOld);
DeleteObject(hpenWhite);
+ DeleteObject(hpenLightGr);
DeleteObject(hpenGrey);
DeleteObject(hpenBlack);
}
DrawFocusRect(hdc, &rectFocus);
}
+ if ( pushed )
+ {
+ // the label is shifted by 1 pixel to create "pushed" effect
+ OffsetRect(&rectBtn, 1, 1);
+ }
+
DrawButtonText(hdc, &rectBtn, GetLabel(),
state & ODS_DISABLED ? GetSysColor(COLOR_GRAYTEXT)
: colFg);
}
#endif // __WIN32__
+
+#endif // wxUSE_BUTTON
+
projects / wxWidgets.git / blobdiff