projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added missing return type
[wxWidgets.git]
/
src
/
msw
/
statbox.cpp
diff --git
a/src/msw/statbox.cpp
b/src/msw/statbox.cpp
index 692e8a10caa5863a38ca07a81ba3b9ec0c14bc53..e568f4475de2872161d571a7c17e98b184d2021f 100644
(file)
--- a/
src/msw/statbox.cpp
+++ b/
src/msw/statbox.cpp
@@
-138,11
+138,6
@@
bool wxStaticBox::Create(wxWindow *parent,
return true;
}
return true;
}
-wxBorder wxStaticBox::GetDefaultBorder() const
-{
- return wxBORDER_NONE;
-}
-
WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const
{
long styleWin = wxStaticBoxBase::MSWGetStyle(style, exstyle);
WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const
{
long styleWin = wxStaticBoxBase::MSWGetStyle(style, exstyle);
@@
-500,13
+495,13
@@
void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc)
if ( !rtl )
{
RECT rc2 = { x, 0, x + width, y };
if ( !rtl )
{
RECT rc2 = { x, 0, x + width, y };
- ::DrawText(hdc, label, label.length(), &rc2,
+ ::DrawText(hdc, label
.wx_str()
, label.length(), &rc2,
DT_SINGLELINE | DT_VCENTER);
}
else // RTL
{
RECT rc2 = { x, 0, x - width, y };
DT_SINGLELINE | DT_VCENTER);
}
else // RTL
{
RECT rc2 = { x, 0, x - width, y };
- ::DrawText(hdc, label, label.length(), &rc2,
+ ::DrawText(hdc, label
.wx_str()
, label.length(), &rc2,
DT_SINGLELINE | DT_VCENTER | DT_RTLREADING);
}
}
DT_SINGLELINE | DT_VCENTER | DT_RTLREADING);
}
}