projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed fl makefiles that Julian didn't fix correctly
[wxWidgets.git]
/
src
/
msw
/
checkbox.cpp
diff --git
a/src/msw/checkbox.cpp
b/src/msw/checkbox.cpp
index 3e10a30ec20096159a2cf0f59c8b098ad115c901..86211b4fcd15873ab3b1e5f39ddd4a6248a6fa5a 100644
(file)
--- a/
src/msw/checkbox.cpp
+++ b/
src/msw/checkbox.cpp
@@
-28,6
+28,8
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
+#if wxUSE_CHECKBOX
+
#ifndef WX_PRECOMP
#include "wx/checkbox.h"
#include "wx/brush.h"
#ifndef WX_PRECOMP
#include "wx/checkbox.h"
#include "wx/brush.h"
@@
-104,6
+106,9
@@
bool wxCheckBox::Create(wxWindow *parent,
if ( style & wxALIGN_RIGHT )
msStyle |= BS_LEFTTEXT;
if ( style & wxALIGN_RIGHT )
msStyle |= BS_LEFTTEXT;
+ if ( style & wxCLIP_SIBLINGS )
+ msStyle |= WS_CLIPSIBLINGS;
+
// We perhaps have different concepts of 3D here - a 3D border,
// versus a 3D button.
// So we only wish to give a border if this is specified
// We perhaps have different concepts of 3D here - a 3D border,
// versus a 3D button.
// So we only wish to give a border if this is specified
@@
-207,7
+212,7
@@
void wxCheckBox::Command (wxCommandEvent & event)
// wxBitmapCheckBox
// ----------------------------------------------------------------------------
// wxBitmapCheckBox
// ----------------------------------------------------------------------------
-bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *
label
,
+bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *
WXUNUSED(label)
,
const wxPoint& pos,
const wxSize& size, long style,
const wxValidator& validator,
const wxPoint& pos,
const wxSize& size, long style,
const wxValidator& validator,
@@
-262,7
+267,9
@@
bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l
return TRUE;
}
return TRUE;
}
-void wxBitmapCheckBox::SetLabel(const wxBitmap&
bitmap
)
+void wxBitmapCheckBox::SetLabel(const wxBitmap&
WXUNUSED(bitmap)
)
{
wxFAIL_MSG(wxT("not implemented"));
}
{
wxFAIL_MSG(wxT("not implemented"));
}
+
+#endif // wxUSE_CHECKBOX