Added wxNB_FLAT for WinCE property sheet tabs
Titlebar OK button on PocketPC now looks for OK, Cancel, Close buttons. Dialog size now takes into account SIP or menubar. Panels more naturally white on PocketPC. wxDIALOG_EX_CONTEXTHELP ignored on WinCE since it interferes with correct titlebar style. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -452,7 +452,15 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
|
||||
{
|
||||
#ifndef __SMARTPHONE__
|
||||
case IDOK:
|
||||
wxButton *btn = wxDynamicCast(FindWindow(wxID_CANCEL), wxButton);
|
||||
// First, try the OK button, since it's closest in meaning.
|
||||
wxButton *btn = wxDynamicCast(FindWindow(wxID_OK), wxButton);
|
||||
|
||||
// Next, try Cancel or Close buttons
|
||||
if (!btn)
|
||||
btn = wxDynamicCast(FindWindow(wxID_CANCEL), wxButton);
|
||||
if (!btn)
|
||||
btn = wxDynamicCast(FindWindow(wxID_CLOSE), wxButton);
|
||||
|
||||
if ( btn && btn->IsEnabled() )
|
||||
{
|
||||
// if we do have a cancel button, do press it
|
||||
@@ -460,6 +468,13 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
|
||||
processed = true;
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Finally, if there aren't appropriate buttons,
|
||||
// act as if it were the normal close button.
|
||||
processed = !Close();
|
||||
}
|
||||
|
||||
#else // ifdef __SMARTPHONE__
|
||||
case IDM_LEFT:
|
||||
case IDM_RIGHT:
|
||||
|
||||
Reference in New Issue
Block a user