AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed handling of modal dialogs.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis 2004-10-24 12:08:25 +00:00
parent c871c71b9b
commit 86dc230162
2 changed files with 185 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
include/wx/os2/dialog.h
View File

@ -27,52 +27,17 @@ public:
inline wxDialog() { Init(); }
//
// Constructor with a modal flag, but no window id - the old convention
//
inline wxDialog( wxWindow* pParent
,const wxString& rsTitle
,bool bModal
,int nX = -1
,int nY = -1
,int nWidth = 500
,int nHeight = 500
,long lStyle = wxDEFAULT_DIALOG_STYLE
,const wxString& rsName = wxDialogNameStr
)
// full ctor
wxDialog(wxWindow *parent, wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_DIALOG_STYLE,
const wxString& name = wxDialogNameStr)
{
long lModalStyle = lStyle ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
Init();
Create( pParent
,-1
,rsTitle
,wxPoint(nX, nY)
,wxSize(nWidth, nHeight)
,lStyle | lModalStyle
,rsName
);
}
//
// Constructor with no modal flag - the new convention.
//
inline wxDialog( wxWindow* pParent
,wxWindowID vId
,const wxString& rsTitle
,const wxPoint& rPos = wxDefaultPosition
,const wxSize& rSize = wxDefaultSize
,long lStyle = wxDEFAULT_DIALOG_STYLE
,const wxString& rsName = wxDialogNameStr
)
{
Create( pParent
,vId
,rsTitle
,rPos
,rSize
,lStyle
,rsName
);
(void)Create(parent, id, title, pos, size, style, name);
}
bool Create( wxWindow* pParent
@ -83,31 +48,22 @@ public:
,long lStyle = wxDEFAULT_DIALOG_STYLE
,const wxString& rsName = wxDialogNameStr
);
~wxDialog();
virtual ~wxDialog();
void SetModal(bool bFlag);
virtual bool IsModal(void) const;
// return true if we're showing the dialog modally
virtual bool IsModal() const { return m_modalData != NULL; }
// For now, same as Show(TRUE) but returns return code
// show the dialog modally and return the value passed to EndModal()
virtual int ShowModal();
// may be called to terminate the dialog with the given return code
virtual void EndModal(int retCode);
//
// Returns TRUE if we're in a modal loop
//
bool IsModalShowing() const;
//
// Implementation only from now on
// implementation only from now on
// -------------------------------
//
//
// Override some base class virtuals
//
virtual bool Show(bool bShow);
// override some base class virtuals
virtual bool Show(bool show = true);
//
// Event handlers
@ -134,20 +90,47 @@ public:
,WXWPARAM wParam
,WXLPARAM lParam
);
// obsolete methods
// ----------------
// Constructor with a modal flag, but no window id - the old convention
wxDEPRECATED( wxDialog( wxWindow* pParent
,const wxString& rsTitle
,bool bModal
,int nX = -1
,int nY = -1
,int nWidth = 500
,int nHeight = 500
,long lStyle = wxDEFAULT_DIALOG_STYLE
,const wxString& rsName = wxDialogNameStr
) );
// just call Show() or ShowModal()
wxDEPRECATED( void SetModal(bool bFlag) );
// use IsModal()
wxDEPRECATED( bool IsModalShowing() const );
protected:
//
// Show modal dialog and enter modal loop
// find the window to use as parent for this dialog if none has been
// specified explicitly by the user
//
void DoShowModal(void);
// may return NULL
//
wxWindow *FindSuitableParent() const;
//
// Common part of all ctors
//
void Init(void);
// end either modal or modeless dialog
void EndDialog(int rc);
private:
wxWindow* m_pOldFocus;
bool m_endModalCalled; // allow for closing within InitDialog
// this pointer is non-NULL only while the modal event loop is running
wxDialogModalData *m_modalData;
@ -160,6 +143,7 @@ private:
DECLARE_DYNAMIC_CLASS(wxDialog)
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxDialog)
}; // end of CLASS wxDialog
#endif // _WX_DIALOG_H_

268
src/os2/dialog.cpp
View File

@ -41,6 +41,7 @@ BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
EVT_CHAR_HOOK(wxDialog::OnCharHook)
EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged)
EVT_CLOSE(wxDialog::OnCloseWindow)
END_EVENT_TABLE()
@ -130,26 +131,35 @@ bool wxDialog::Create(
return TRUE;
} // end of wxDialog::Create
// deprecated ctor
wxDialog::wxDialog(wxWindow *parent,
const wxString& title,
bool WXUNUSED(modal),
int x,
int y,
int w,
int h,
long style,
const wxString& name)
{
Init();
Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h), style, name);
}
void wxDialog::SetModal(
bool bFlag
bool WXUNUSED(bFlag)
)
{
if (bFlag)
{
m_windowStyle |= wxDIALOG_MODAL ;
wxModelessWindows.DeleteObject(this);
}
else
{
m_windowStyle &= ~wxDIALOG_MODAL ;
wxModelessWindows.Append(this);
}
// nothing to do, obsolete method
} // end of wxDialog::SetModal
wxDialog::~wxDialog()
{
m_isBeingDeleted = TRUE;
Show(FALSE);
// this will also reenable all the other windows for a modal dialog
Show(false);
} // end of wxDialog::~wxDialog
//
@ -190,109 +200,72 @@ void wxDialog::OnCharHook(
// showing the dialogs
// ----------------------------------------------------------------------------
bool wxDialog::IsModal() const
{
return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;
} // end of wxDialog::IsModal
bool wxDialog::IsModalShowing() const
{
return m_modalData != NULL; // const_cast
return IsModal();
} // end of wxDialog::IsModalShowing
void wxDialog::DoShowModal()
wxWindow *wxDialog::FindSuitableParent() const
{
wxWindow* pParent = GetParent();
wxWindow* pOldFocus = m_pOldFocus;
HWND hWndOldFocus = 0;
wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
wxCHECK_RET( IsModal(), _T("can't DoShowModal() modeless dialog") );
if (pOldFocus)
hWndOldFocus = (HWND)pOldFocus->GetHWND();
//
// Remember where the focus was
//
if (!pOldFocus)
// first try to use the currently active window
HWND hwndFg = ::WinQueryActiveWindow(HWND_DESKTOP);
wxWindow *parent = hwndFg ? wxFindWinFromHandle((WXHWND)hwndFg)
: NULL;
if ( !parent )
{
pOldFocus = pParent;
if (pParent)
hWndOldFocus = GetHwndOf(pParent);
// next try the main app window
parent = wxTheApp->GetTopWindow();
}
//
// Disable all other app windows
//
wxASSERT_MSG(!m_pWindowDisabler, _T("disabling windows twice?"));
//
// Before entering the modal loop, reset the "is in OnIdle()" flag (see
// comment in app.cpp)
//
extern bool gbInOnIdle;
bool bWasInOnIdle = gbInOnIdle;
gbInOnIdle = FALSE;
// enter the modal loop
// finally, check if the parent we found is really suitable
if ( !parent || parent == (wxWindow *)this || !parent->IsShown() )
{
wxDialogModalDataTiedPtr modalData(&m_modalData,
new wxDialogModalData(this));
modalData->RunLoop();
// don't use this one
parent = NULL;
}
gbInOnIdle = bWasInOnIdle;
//
// and restore focus
// Note that this code MUST NOT access the dialog object's data
// in case the object has been deleted (which will be the case
// for a modal dialog that has been destroyed before calling EndModal).
//
if (pOldFocus && (pOldFocus != this) && ::WinIsWindow(vHabmain, hWndOldFocus))
{
//
// This is likely to prove that the object still exists
//
if (wxFindWinFromHandle((WXHWND) hWndOldFocus) == pOldFocus)
pOldFocus->SetFocus();
}
} // end of wxDialog::DoShowModal
return parent;
}
bool wxDialog::Show(
bool bShow
)
{
if (!bShow)
if ( bShow == IsShown() )
return false;
if (!bShow && m_modalData )
{
//
// If we had disabled other app windows, reenable them back now because
// we need to do this before calling wxDialogBase version because if we
// had disabled other app windows, they must be reenabled right now as
// if they stay disabled Windows will activate another window (one
// which is enabled, anyhow) and we will lose activation. We really don't
// do this in OS/2 since PM does this for us.
//
// which is enabled, anyhow) when we're hidden in the base class Show()
// and we will lose activation
m_modalData->ExitLoop();
#if 0
if (m_pWindowDisabler)
{
delete m_pWindowDisabler;
m_pWindowDisabler = NULL;
}
if ( m_modalData )
m_modalData->ExitLoop();
}
//
// ShowModal() may be called for already shown dialog
//
if (!wxDialogBase::Show(bShow) && !(bShow && IsModal()))
{
//
// Nothing to do
//
return FALSE;
#endif
}
if (bShow)
{
// this usually will result in TransferDataToWindow() being called
// which will change the controls values so do it before showing as
// otherwise we could have some flicker
InitDialog();
}
wxDialogBase::Show(bShow);
if (GetTitle().c_str())
::WinSetWindowText((HWND)GetHwnd(), GetTitle().c_str());
if ( bShow )
{
// dialogs don't get WM_SIZE message after creation unlike most (all?)
// other windows and so could start their life non laid out correctly
@ -300,40 +273,10 @@ bool wxDialog::Show(
//
// NB: normally we should call it just the first time but doing it
// every time is simpler than keeping a flag
// Layout();
//
// Usually will result in TransferDataToWindow() being called
//
InitDialog();
Layout();
}
if (GetTitle().c_str())
::WinSetWindowText((HWND)GetHwnd(), GetTitle().c_str());
if (IsModal())
{
if (bShow)
{
//
// Modal dialog needs a parent window, so try to find one
//
if (!GetParent())
{
wxWindow* pParent = wxTheApp->GetTopWindow();
if ( pParent && pParent != this && pParent->IsShown() )
{
//
// Use it
//
m_parent = pParent;
}
}
DoShowModal();
}
}
return TRUE;
return true;
} // end of wxDialog::Show
//
@ -341,11 +284,67 @@ bool wxDialog::Show(
//
int wxDialog::ShowModal()
{
if (!IsModal())
wxASSERT_MSG( !IsModal(), _T("wxDialog::ShowModal() reentered?") );
m_endModalCalled = false;
Show();
// EndModal may have been called from InitDialog handler (called from
// inside Show()), which would cause an infinite loop if we didn't take it
// into account
if ( !m_endModalCalled )
{
SetModal(TRUE);
// modal dialog needs a parent window, so try to find one
wxWindow *parent = GetParent();
if ( !parent )
{
parent = FindSuitableParent();
}
// remember where the focus was
wxWindow *oldFocus = m_pOldFocus;
if ( !oldFocus )
{
// VZ: do we really want to do this?
oldFocus = parent;
}
// We have to remember the HWND because we need to check
// the HWND still exists (oldFocus can be garbage when the dialog
// exits, if it has been destroyed)
HWND hwndOldFocus = oldFocus ? GetHwndOf(oldFocus) : NULL;
//
// Before entering the modal loop, reset the "is in OnIdle()" flag (see
// comment in app.cpp)
//
extern bool gbInOnIdle;
bool bWasInOnIdle = gbInOnIdle;
gbInOnIdle = FALSE;
// enter and run the modal loop
{
wxDialogModalDataTiedPtr modalData(&m_modalData,
new wxDialogModalData(this));
modalData->RunLoop();
}
gbInOnIdle = bWasInOnIdle;
// and restore focus
// Note that this code MUST NOT access the dialog object's data
// in case the object has been deleted (which will be the case
// for a modal dialog that has been destroyed before calling EndModal).
if ( oldFocus && (oldFocus != this) && ::WinIsWindow(vHabmain, hwndOldFocus))
{
// This is likely to prove that the object still exists
if (wxFindWinFromHandle((WXHWND) hwndOldFocus) == oldFocus)
oldFocus->SetFocus();
}
}
Show(TRUE);
return GetReturnCode();
} // end of wxDialog::ShowModal
@ -353,10 +352,22 @@ void wxDialog::EndModal(
int nRetCode
)
{
wxASSERT_MSG( IsModal(), _T("EndModal() called for non modal dialog") );
m_endModalCalled = true;
SetReturnCode(nRetCode);
Show(FALSE);
Hide();
} // end of wxDialog::EndModal
void wxDialog::EndDialog(int rc)
{
if ( IsModal() )
EndModal(rc);
else
Hide();
}
// ----------------------------------------------------------------------------
// wxWin event handlers
// ----------------------------------------------------------------------------
@ -376,7 +387,7 @@ void wxDialog::OnOK(
{
if ( Validate() && TransferDataFromWindow() )
{
EndModal(wxID_OK);
EndDialog(wxID_OK);
}
} // end of wxDialog::OnOK
@ -384,7 +395,7 @@ void wxDialog::OnCancel(
wxCommandEvent& rEvent
)
{
EndModal(wxID_CANCEL);
EndDialog(wxID_CANCEL);
} // end of wxDialog::OnCancel
void wxDialog::OnCloseWindow(
@ -392,8 +403,7 @@ void wxDialog::OnCloseWindow(
)
{
//
// We'll send a Cancel message by default,
// which may close the dialog.
// We'll send a Cancel message by default, which may close the dialog.
// Check for looping if the Cancel event handler calls Close().
//
// Note that if a cancel button and handler aren't present in the dialog,