projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't send idle events while an assertion dialog is showing.
[wxWidgets.git]
/
src
/
univ
/
checkbox.cpp
diff --git
a/src/univ/checkbox.cpp
b/src/univ/checkbox.cpp
index 916ea5c501fe28e03174072fa4ea9a66949196d1..e80d036343707c130a76773718447049813f9521 100644
(file)
--- a/
src/univ/checkbox.cpp
+++ b/
src/univ/checkbox.cpp
@@
-6,7
+6,7
@@
// Created: 25.08.00
// RCS-ID: $Id$
// Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
// Created: 25.08.00
// RCS-ID: $Id$
// Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence: wxWindows licen
s
e
+// Licence: wxWindows licen
c
e
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
@@
-17,7
+17,7
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "univcheckbox.h"
#endif
#pragma implementation "univcheckbox.h"
#endif
@@
-67,7
+67,7
@@
bool wxCheckBox::Create(wxWindow *parent,
const wxValidator& validator,
const wxString &name)
{
const wxValidator& validator,
const wxString &name)
{
- if ( !wxControl::Create(parent, id, pos, size, style,
wxDefaultV
alidator, name) )
+ if ( !wxControl::Create(parent, id, pos, size, style,
v
alidator, name) )
return FALSE;
SetLabel(label);
return FALSE;
SetLabel(label);
@@
-154,10
+154,12
@@
void wxCheckBox::DoDraw(wxControlRenderer *renderer)
if ( m_status == Status_Checked )
flags |= wxCONTROL_CHECKED;
if ( m_status == Status_Checked )
flags |= wxCONTROL_CHECKED;
+ wxBitmap bitmap(GetBitmap(GetState(flags), m_status));
+
renderer->GetRenderer()->
DrawCheckButton(dc,
GetLabel(),
renderer->GetRenderer()->
DrawCheckButton(dc,
GetLabel(),
-
GetBitmap(GetState(flags), m_status)
,
+
bitmap
,
renderer->GetRect(),
flags,
GetWindowStyle() & wxALIGN_RIGHT ? wxALIGN_RIGHT
renderer->GetRect(),
flags,
GetWindowStyle() & wxALIGN_RIGHT ? wxALIGN_RIGHT
@@
-276,12
+278,12
@@
wxStdCheckboxInputHandler::wxStdCheckboxInputHandler(wxInputHandler *inphand)
{
}
{
}
-bool wxStdCheckboxInputHandler::HandleActivation(wx
Control *control
,
- bool
activated
)
+bool wxStdCheckboxInputHandler::HandleActivation(wx
InputConsumer *consumer
,
+ bool
WXUNUSED(activated)
)
{
// only the focused checkbox appearance changes when the app gains/loses
// activation
{
// only the focused checkbox appearance changes when the app gains/loses
// activation
- return con
trol
->IsFocused();
+ return con
sumer->GetInputWindow()
->IsFocused();
}
#endif // wxUSE_CHECKBOX
}
#endif // wxUSE_CHECKBOX