reverted patch 598016 (removed MSWCreateControl() visible parameter)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -79,13 +79,12 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
|
||||
const wxString& label,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
long style,
|
||||
bool visible)
|
||||
long style)
|
||||
{
|
||||
WXDWORD exstyle;
|
||||
WXDWORD msStyle = MSWGetStyle(style, &exstyle);
|
||||
|
||||
return MSWCreateControl(classname, msStyle, pos, size, label, exstyle, visible);
|
||||
return MSWCreateControl(classname, msStyle, pos, size, label, exstyle);
|
||||
}
|
||||
|
||||
bool wxControl::MSWCreateControl(const wxChar *classname,
|
||||
@@ -93,8 +92,7 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
const wxString& label,
|
||||
WXDWORD exstyle,
|
||||
bool visible)
|
||||
WXDWORD exstyle)
|
||||
{
|
||||
// want3D tells us whether or not the style specified a 3D border.
|
||||
// If so, under WIN16 we can use Ctl3D to give it an appropriate style.
|
||||
@@ -110,18 +108,7 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
|
||||
|
||||
// all controls should have these styles (wxWindows creates all controls
|
||||
// visible by default)
|
||||
style |= WS_CHILD;
|
||||
|
||||
// sometimes, controls will defer showing the window until
|
||||
// all configuration, sizing, and positioning is completed
|
||||
if (!visible)
|
||||
{
|
||||
m_isShown = FALSE;
|
||||
}
|
||||
else
|
||||
{
|
||||
style |= WS_VISIBLE;
|
||||
}
|
||||
style |= WS_CHILD | WS_VISIBLE;
|
||||
|
||||
int x = pos.x == -1 ? 0 : pos.x,
|
||||
y = pos.y == -1 ? 0 : pos.y,
|
||||
|
Reference in New Issue
Block a user