projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Give wxScrolledWindow its own Layout method that takes into account
[wxWidgets.git]
/
src
/
os2
/
dialog.cpp
diff --git
a/src/os2/dialog.cpp
b/src/os2/dialog.cpp
index e503f93cc89ee7337faad783be4682385f44a154..eb635379c9397889fc060f65593ee8d60ef6634a 100644
(file)
--- a/
src/os2/dialog.cpp
+++ b/
src/os2/dialog.cpp
@@
-35,7
+35,7
@@
wxWindowList wxModalDialogs;
IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
-BEGIN_EVENT_TABLE(wxDialog, wx
TopLevelWindow
)
+BEGIN_EVENT_TABLE(wxDialog, wx
DialogBase
)
EVT_BUTTON(wxID_OK, wxDialog::OnOK)
EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
EVT_BUTTON(wxID_OK, wxDialog::OnOK)
EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
@@
-93,6
+93,12
@@
bool wxDialog::Create(
))
return FALSE;
SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
))
return FALSE;
SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+
+ //
+ // Must defer setting the title until after dialog is created and sized
+ //
+ if (!rsTitle.IsNull())
+ SetTitle(rsTitle);
return TRUE;
} // end of wxDialog::Create
return TRUE;
} // end of wxDialog::Create
@@
-194,7
+200,11
@@
void wxDialog::DoShowModal()
//
wxASSERT_MSG(!m_pWindowDisabler, _T("disabling windows twice?"));
//
wxASSERT_MSG(!m_pWindowDisabler, _T("disabling windows twice?"));
- m_pWindowDisabler = new wxWindowDisabler(this);
+ //
+ // Disables other app windows and window proc message processing
+ // until WinDismissDlg called
+ //
+ ::WinProcessDlg((HWND)GetHwnd());
//
// Enter the modal loop
//
// Enter the modal loop
@@
-237,7
+247,8
@@
bool wxDialog::Show(
//
// If we had disabled other app windows, reenable them back now because
// if they stay disabled Windows will activate another window (one
//
// If we had disabled other app windows, reenable them back now because
// if they stay disabled Windows will activate another window (one
- // which is enabled, anyhow) and we will lose activation
+ // which is enabled, anyhow) and we will lose activation. We really don't
+ // do this in OS/2 since PM does this for us.
//
if (m_pWindowDisabler)
{
//
if (m_pWindowDisabler)
{
@@
-265,6
+276,8
@@
bool wxDialog::Show(
InitDialog();
}
InitDialog();
}
+ if (GetTitle().c_str())
+ ::WinSetWindowText((HWND)GetHwnd(), GetTitle().c_str());
if (IsModal())
{
if (bShow)
if (IsModal())
{
if (bShow)
@@
-318,6
+331,7
@@
void wxDialog::EndModal(
{
SetReturnCode(nRetCode);
Show(FALSE);
{
SetReturnCode(nRetCode);
Show(FALSE);
+ ::WinDismissDlg((HWND)GetHwnd(), nRetCode);
} // end of wxDialog::EndModal
// ----------------------------------------------------------------------------
} // end of wxDialog::EndModal
// ----------------------------------------------------------------------------