#include "wx/os2/private.h"
#include "wx/log.h"
+#include "wx/evtloop.h"
+#include "wx/ptr_scpd.h"
#define wxDIALOG_DEFAULT_X 300
#define wxDIALOG_DEFAULT_Y 300
#define wxDIALOG_DEFAULT_WIDTH 500
#define wxDIALOG_DEFAULT_HEIGHT 500
-// Lists to keep track of windows, so we can disable/enable them
-// for modal dialogs
-wxWindowList wxModalDialogs;
-wxWindowList wxModelessWindows; // Frames and modeless dialogs
-extern wxList WXDLLEXPORT wxPendingDelete;
+IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
- IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel)
+BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
+ EVT_BUTTON(wxID_OK, wxDialog::OnOK)
+ EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
+ EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
+ EVT_CHAR_HOOK(wxDialog::OnCharHook)
+ EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged)
+ EVT_CLOSE(wxDialog::OnCloseWindow)
+END_EVENT_TABLE()
- BEGIN_EVENT_TABLE(wxDialog, wxPanel)
- EVT_SIZE(wxDialog::OnSize)
- EVT_BUTTON(wxID_OK, wxDialog::OnOK)
- EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
- EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
- EVT_CHAR_HOOK(wxDialog::OnCharHook)
- EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged)
- EVT_CLOSE(wxDialog::OnCloseWindow)
- END_EVENT_TABLE()
+// ----------------------------------------------------------------------------
+// wxDialogModalData
+// ----------------------------------------------------------------------------
+
+// this is simply a container for any data we need to implement modality which
+// allows us to avoid changing wxDialog each time the implementation changes
+class wxDialogModalData
+{
+public:
+ wxDialogModalData(wxDialog *dialog) : m_evtLoop(dialog) { }
+
+ void RunLoop()
+ {
+ m_evtLoop.Run();
+ }
+
+ void ExitLoop()
+ {
+ m_evtLoop.Exit();
+ }
+
+private:
+ wxModalEventLoop m_evtLoop;
+};
+
+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData);
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxDialog construction
+// ----------------------------------------------------------------------------
void wxDialog::Init()
{
m_pOldFocus = (wxWindow *)NULL;
m_isShown = FALSE;
m_pWindowDisabler = (wxWindowDisabler *)NULL;
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+ m_modalData = NULL;
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
} // end of wxDialog::Init
bool wxDialog::Create(
HWND hWnd;
Init();
- m_pOldFocus = (wxWindow*)FindFocus();
- SetName(rsName);
- wxTopLevelWindows.Append(this);
- if (pParent)
- pParent->AddChild(this);
- if (vId == -1)
- m_windowId = NewControlId();
- else
- m_windowId = vId;
- if (lX < 0)
- lX = wxDIALOG_DEFAULT_X;
- if (lY < 0)
- lY = wxDIALOG_DEFAULT_Y;
- m_windowStyle = lStyle;
- if (lWidth < 0)
- lWidth = wxDIALOG_DEFAULT_WIDTH;
- if (lHeight < 0)
- lHeight = wxDIALOG_DEFAULT_HEIGHT;
+ SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
//
- // All dialogs should really have this style
+ // Save focus before doing anything which can potentially change it
//
- m_windowStyle |= wxTAB_TRAVERSAL;
+ m_pOldFocus = FindFocus();
//
- // Allows creation of dialogs with & without captions under MSWindows,
- // resizeable or not (but a resizeable dialog always has caption -
- // otherwise it would look too strange)
+ // All dialogs should really have this style
//
- if (lStyle & wxRESIZE_BORDER )
- zDlg = "wxResizeableDialog";
- else if (lStyle & wxCAPTION )
- zDlg = "wxCaptionDialog";
- else
- zDlg = "wxNoCaptionDialog";
- OS2Create( GetWinHwnd(pParent)
- ,NULL
- ,rsTitle.c_str()
- ,0L
- ,lX
- ,lY
- ,lWidth
- ,lHeight
- ,GetWinHwnd(pParent)
- ,HWND_TOP
- ,(long)m_windowId
- ,NULL
- ,NULL
- );
- hWnd = (HWND)GetHWND();
- if (!hWnd)
- {
+ lStyle |= wxTAB_TRAVERSAL;
+
+ if (!wxTopLevelWindow::Create( pParent
+ ,vId
+ ,rsTitle
+ ,rPos
+ ,rSize
+ ,lStyle
+ ,rsName
+ ))
return FALSE;
- }
- SubclassWin(GetHWND());
- ::WinSetWindowText( hWnd
- ,(PSZ)rsTitle.c_str()
- );
- SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ 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
)
{
if (bFlag)
+ {
m_windowStyle |= wxDIALOG_MODAL ;
- else if ( m_windowStyle & wxDIALOG_MODAL )
- m_windowStyle -= wxDIALOG_MODAL ;
-
- wxModelessWindows.DeleteObject(this);
- if (!bFlag)
- wxModelessWindows.Append(this);
+ wxModelessWindows.DeleteObject(this);
+ }
+ else
+ {
+ m_windowStyle &= ~wxDIALOG_MODAL ;
+ wxModelessWindows.Append(this);
+ }
} // end of wxDialog::SetModal
wxDialog::~wxDialog()
{
m_isBeingDeleted = TRUE;
- wxTopLevelWindows.DeleteObject(this);
Show(FALSE);
- if (!IsModal)
- wxModelessWindows.DeleteObject(this);
-
- //
- // If this is the last top-level window, exit.
- //
- if (wxTheApp && (wxTopLevelWindows.Number() == 0))
- {
- wxTheApp->SetTopWindow(NULL);
-
- if (wxTheApp->GetExitOnFrameDelete())
- {
- ::WinPostMsg(GetHwnd(), WM_QUIT, 0, 0);
- }
- }
} // end of wxDialog::~wxDialog
//
rEvent.Skip();
}
-void wxDialog::Iconize(
- bool WXUNUSED(bIconize)
-)
-{
-} // end of wxDialog::Iconize
-
-bool wxDialog::IsIconized() const
-{
- return FALSE;
-} // end of wxDialog::IsIconized
-
-void wxDialog::DoSetClientSize(
- int nWidth
-, int nHeight
-)
-{
- HWND hWnd = (HWND) GetHWND();
- RECTL vRect;
- RECTL vRect2;
-
- ::WinQueryWindowRect(hWnd, &vRect);
- ::WinQueryWindowRect(hWnd, &vRect2);
-
- LONG lActualWidth = vRect2.xRight - vRect2.xLeft - vRect.xRight + nWidth;
- LONG lActualHeight = vRect2.yTop + vRect2.yTop - vRect.yTop + nHeight;
-
- ::WinSetWindowPos( GetHwnd()
- ,HWND_TOP
- ,(LONG)vRect2.xLeft
- ,(LONG)vRect2.yTop
- ,(LONG)lActualWidth
- ,(LONG)lActualHeight
- ,SWP_SIZE | SWP_MOVE
- );
-
- wxSizeEvent vEvent( wxSize( lActualWidth
- ,lActualHeight
- )
- ,m_windowId
- );
-
- vEvent.SetEventObject( this );
- GetEventHandler()->ProcessEvent(vEvent);
-} // end of wxDialog::DoSetClientSize
-
-void wxDialog::DoGetPosition(
- int* pnX
-, int* pnY
-) const
-{
- RECTL vRect;
-
- ::WinQueryWindowRect(GetHwnd(), &vRect);
- if (pnX)
- *pnX = vRect.xLeft;
- if (pnY)
- *pnY = vRect.yBottom; // OS/2's bottom is windows' top???
-} // end of wxDialog::DoGetPosition
+// ----------------------------------------------------------------------------
+// showing the dialogs
+// ----------------------------------------------------------------------------
bool wxDialog::IsModal() const
{
bool wxDialog::IsModalShowing() const
{
- return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
+ return m_modalData != NULL; // const_cast
} // end of wxDialog::IsModalShowing
void wxDialog::DoShowModal()
wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
wxCHECK_RET( IsModal(), _T("can't DoShowModal() modeless dialog") );
- wxModalDialogs.Append(this);
if (pOldFocus)
hWndOldFocus = (HWND)pOldFocus->GetHWND();
//
wxASSERT_MSG(!m_pWindowDisabler, _T("disabling windows twice?"));
- m_pWindowDisabler = new wxWindowDisabler(this);
-
//
- // Enter the modal loop
+ // Before entering the modal loop, reset the "is in OnIdle()" flag (see
+ // comment in app.cpp)
//
- while ( IsModalShowing() )
- {
-#if wxUSE_THREADS
- wxMutexGuiLeaveOrEnter();
-#endif // wxUSE_THREADS
+ extern bool gbInOnIdle;
+ bool bWasInOnIdle = gbInOnIdle;
- while ( !wxTheApp->Pending() && wxTheApp->ProcessIdle() )
- ;
+ gbInOnIdle = FALSE;
- // a message came or no more idle processing to do
- wxTheApp->DoMessage();
+ // enter the modal loop
+ {
+ wxDialogModalDataTiedPtr modalData(&m_modalData,
+ new wxDialogModalData(this));
+ modalData->RunLoop();
}
+ gbInOnIdle = bWasInOnIdle;
//
- // Snd restore focus
+ // 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 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)
{
delete m_pWindowDisabler;
m_pWindowDisabler = NULL;
}
+ if ( m_modalData )
+ m_modalData->ExitLoop();
}
//
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
+ // if we didn't call Layout() from here
+ //
+ // 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();
}
+ if (GetTitle().c_str())
+ ::WinSetWindowText((HWND)GetHwnd(), GetTitle().c_str());
if (IsModal())
{
if (bShow)
}
DoShowModal();
}
- else // end of modal dialog
- {
- //
- // This will cause IsModalShowing() return FALSE and our local
- // message loop will terminate
- //
- wxModalDialogs.DeleteObject(this);
- }
}
- return FALSE;
+ return TRUE;
} // end of wxDialog::Show
//
Show(FALSE);
} // end of wxDialog::EndModal
+// ----------------------------------------------------------------------------
+// wxWin event handlers
+// ----------------------------------------------------------------------------
+
void wxDialog::OnApply(
wxCommandEvent& rEvent
)
closing.DeleteObject(this);
} // end of wxDialog::OnCloseWindow
-//
-// Destroy the window (delayed, if a managed window)
-//
-bool wxDialog::Destroy()
-{
- wxCHECK_MSG( !wxPendingDelete.Member(this), FALSE,
- _T("wxDialog destroyed twice") );
- wxPendingDelete.Append(this);
- return TRUE;
-} // end of wxDialog::Destroy
-
void wxDialog::OnSysColourChanged(
wxSysColourChangedEvent& rEvent
)
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
Refresh();
} // end of wxDialog::OnSysColourChanged
projects / wxWidgets.git / blobdiff