Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Weekly updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-08-30 21:54:47 +00:00
parent ef5f8ab626
commit cfcebdb1bb
10 changed files with 174 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/os2/button.cpp
View File

@@ -234,9 +234,13 @@ void wxButton::SetDefault()
// Set this one as the default button both for wxWindows and Windows
//
wxWindow* pWinOldDefault = pParent->SetDefaultItem(this);
UpdateDefaultStyle( this
,pWinOldDefault
);
SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton)
,FALSE
);
SetDefaultStyle( this
,TRUE
);
} // end of wxButton::SetDefault
void wxButton::SetTmpDefault()
@@ -246,14 +250,14 @@ void wxButton::SetTmpDefault()
wxCHECK_RET( pParent, _T("button without parent?") );
wxWindow* pWinOldDefault = pParent->GetDefaultItem();
pParent->SetTmpDefaultItem(this);
if (pWinOldDefault != this)
{
UpdateDefaultStyle( this
,pWinOldDefault
);
}
//else: no styles to update
SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton)
,FALSE
);
SetDefaultStyle( this
,TRUE
);
} // end of wxButton::SetTmpDefault
void wxButton::UnsetTmpDefault()
@@ -266,47 +270,60 @@ void wxButton::UnsetTmpDefault()
wxWindow* pWinOldDefault = pParent->GetDefaultItem();
if (pWinOldDefault != this)
{
UpdateDefaultStyle( pWinOldDefault
,this
);
}
//else: we had been default before anyhow
SetDefaultStyle( this
,FALSE
);
SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton)
,TRUE
);
} // end of wxButton::UnsetTmpDefault
void wxButton::UpdateDefaultStyle(
wxWindow* pWinDefault
, wxWindow* pWinOldDefault)
void wxButton::SetDefaultStyle(
wxButton* pBtn
, bool bOn
)
{
wxButton* pBtnOldDefault = wxDynamicCast(pWinOldDefault, wxButton);
long lStyle;
//
// We may be called with NULL pointer -- simpler to do the check here than
// in the caller which does wxDynamicCast()
//
if (!pBtn)
return;
if ( pBtnOldDefault && pBtnOldDefault != pWinDefault )
//
// First, let DefDlgProc() know about the new default button
//
if (bOn)
{
if (!wxTheApp->IsActive())
return;
//
// In OS/2 the dialog/panel doesn't really know it has a default
// button, the default button simply has that style. We'll just
// simulate by setting focus to it
//
pBtn->SetFocus();
}
lStyle = ::WinQueryWindowULong(GetHwndOf(pBtn), QWL_STYLE);
if (!(lStyle & BS_DEFAULT) == bOn)
{
lStyle = ::WinQueryWindowULong(GetHwndOf(pBtnOldDefault), QWL_STYLE);
if ((lStyle & BS_USERBUTTON) != BS_USERBUTTON)
{
lStyle &= ~BS_DEFAULT;
::WinSetWindowULong(GetHwndOf(pBtnOldDefault), QWL_STYLE, lStyle);
if (bOn)
lStyle | BS_DEFAULT;
else
lStyle &= ~BS_DEFAULT;
::WinSetWindowULong(GetHwndOf(pBtn), QWL_STYLE, lStyle);
}
else
{
// redraw the button - it will notice itself that it's not the
//
// Redraw the button - it will notice itself that it's not the
// default one any longer
pBtnOldDefault->Refresh();
}
}
wxButton* pBtnDefault = wxDynamicCast(pWinDefault, wxButton);
if (pBtnDefault)
{
lStyle = ::WinQueryWindowULong(GetHwndOf(pBtnDefault), QWL_STYLE);
if ((lStyle & BS_USERBUTTON) != BS_USERBUTTON)
{
lStyle != BS_DEFAULT;
::WinSetWindowULong(GetHwndOf(pBtnDefault), QWL_STYLE, lStyle);
//
pBtn->Refresh();
}
}
} // end of wxButton::UpdateDefaultStyle