/////////////////////////////////////////////////////////////////////////////
-// Name: dialog.cpp
+// Name: src/os2/dialog.cpp
// Purpose: wxDialog class
// Author: David Webster
// Modified by:
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#ifndef WX_PRECOMP
#include "wx/dialog.h"
-#include "wx/utils.h"
-#include "wx/frame.h"
-#include "wx/app.h"
-#include "wx/settings.h"
-#include "wx/intl.h"
-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/utils.h"
+ #include "wx/frame.h"
+ #include "wx/app.h"
+ #include "wx/settings.h"
+ #include "wx/intl.h"
+ #include "wx/log.h"
#endif
#include "wx/os2/private.h"
-#include "wx/log.h"
+#include "wx/evtloop.h"
+#include "wx/scopedptr.h"
+#include "wx/modalhook.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, wxPanel)
+// ----------------------------------------------------------------------------
+// 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();
+ }
- 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()
+ 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_pOldFocus = NULL;
+ m_isShown = false;
+ m_pWindowDisabler = NULL;
+ m_modalData = NULL;
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
} // end of wxDialog::Init
-bool wxDialog::Create(
- wxWindow* pParent
-, wxWindowID vId
-, const wxString& rsTitle
-, const wxPoint& rPos
-, const wxSize& rSize
-, long lStyle
-, const wxString& rsName
-)
+bool wxDialog::Create( wxWindow* pParent,
+ wxWindowID vId,
+ const wxString& rsTitle,
+ const wxPoint& rPos,
+ const wxSize& rSize,
+ long lStyle,
+ const wxString& rsName )
{
- long lX = rPos.x;
- long lY = rPos.y;
- long lWidth = rSize.x;
- long lHeight = rSize.y;
- const char* zDlg;
- WXDWORD dwExtendedStyle = 0L;
- 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)
- {
- return FALSE;
- }
- SubclassWin(GetHWND());
- ::WinSetWindowText( hWnd
- ,(PSZ)rsTitle.c_str()
- );
- SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
- return TRUE;
-} // end of wxDialog::Create
+ lStyle |= wxTAB_TRAVERSAL;
-void wxDialog::SetModal(
- bool bFlag
-)
-{
- if (bFlag)
- m_windowStyle |= wxDIALOG_MODAL ;
- else if ( m_windowStyle & wxDIALOG_MODAL )
- m_windowStyle -= wxDIALOG_MODAL ;
-
- wxModelessWindows.DeleteObject(this);
- if (!bFlag)
- wxModelessWindows.Append(this);
-} // end of wxDialog::SetModal
+ if (!wxTopLevelWindow::Create( pParent
+ ,vId
+ ,rsTitle
+ ,rPos
+ ,rSize
+ ,lStyle
+ ,rsName
+ ))
+ return false;
-wxDialog::~wxDialog()
-{
- m_isBeingDeleted = TRUE;
- wxTopLevelWindows.DeleteObject(this);
- Show(FALSE);
- if (!IsModal())
- wxModelessWindows.DeleteObject(this);
+ SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
//
- // If this is the last top-level window, exit.
+ // Must defer setting the title until after dialog is created and sized
//
- if (wxTheApp && (wxTopLevelWindows.Number() == 0))
- {
- wxTheApp->SetTopWindow(NULL);
-
- if (wxTheApp->GetExitOnFrameDelete())
- {
- ::WinPostMsg(GetHwnd(), WM_QUIT, 0, 0);
- }
- }
-} // end of wxDialog::~wxDialog
+ if ( !rsTitle.empty() )
+ SetTitle(rsTitle);
+ return true;
+} // end of wxDialog::Create
-//
-// By default, pressing escape cancels the dialog
-//
-void wxDialog::OnCharHook(
- wxKeyEvent& rEvent
-)
+#if WXWIN_COMPATIBILITY_2_6
+
+// 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)
{
- if (GetHWND())
- {
- if (rEvent.m_keyCode == WXK_ESCAPE)
- {
- //
- // Behaviour changed in 2.0: we'll send a Cancel message
- // to the dialog instead of Close.
- //
- wxCommandEvent vCancelEvent( wxEVT_COMMAND_BUTTON_CLICKED
- ,wxID_CANCEL
- );
-
- vCancelEvent.SetEventObject( this );
- GetEventHandler()->ProcessEvent(vCancelEvent);
+ Init();
- //
- // Ensure that there is another message for this window so the
- // ShowModal loop will exit and won't get stuck in GetMessage().
- //
- ::WinPostMsg(GetHwnd(), WM_NULL, 0, 0);
- return;
- }
- }
- // We didn't process this event.
- rEvent.Skip();
+ Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h), style, name);
}
-void wxDialog::Iconize(
- bool WXUNUSED(bIconize)
-)
+void wxDialog::SetModal(bool WXUNUSED(bFlag))
{
-} // end of wxDialog::Iconize
+ // nothing to do, obsolete method
+} // end of wxDialog::SetModal
-bool wxDialog::IsIconized() const
-{
- return FALSE;
-} // end of wxDialog::IsIconized
+#endif // WXWIN_COMPATIBILITY_2_6
-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
+wxDialog::~wxDialog()
{
- RECTL vRect;
+ SendDestroyEvent();
- ::WinQueryWindowRect(GetHwnd(), &vRect);
- if (pnX)
- *pnX = vRect.xLeft;
- if (pnY)
- *pnY = vRect.yBottom; // OS/2's bottom is windows' top???
-} // end of wxDialog::DoGetPosition
+ // this will also reenable all the other windows for a modal dialog
+ Show(false);
+} // end of wxDialog::~wxDialog
-bool wxDialog::IsModal() const
-{
- return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;
-} // end of wxDialog::IsModal
+// ----------------------------------------------------------------------------
+// showing the dialogs
+// ----------------------------------------------------------------------------
+
+#if WXWIN_COMPATIBILITY_2_6
bool wxDialog::IsModalShowing() const
{
- return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
+ return IsModal();
} // end of wxDialog::IsModalShowing
-void wxDialog::DoShowModal()
-{
- 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") );
+#endif // WXWIN_COMPATIBILITY_2_6
- wxModalDialogs.Append(this);
- if (pOldFocus)
- hWndOldFocus = (HWND)pOldFocus->GetHWND();
+bool wxDialog::Show( bool bShow )
+{
+ if ( bShow == IsShown() )
+ return false;
- //
- // Remember where the focus was
- //
- if (!pOldFocus)
+ if (!bShow && m_modalData )
{
- pOldFocus = pParent;
- if (pParent)
- hWndOldFocus = GetHwndOf(pParent);
+ // 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) when we're hidden in the base class Show()
+ // and we will lose activation
+ m_modalData->ExitLoop();
+#if 0
+ wxDELETE(m_pWindowDisabler);
+#endif
}
- //
- // Disable all other app windows
- //
- wxASSERT_MSG(!m_pWindowDisabler, _T("disabling windows twice?"));
-
- m_pWindowDisabler = new wxWindowDisabler(this);
-
- //
- // Enter the modal loop
- //
- while ( IsModalShowing() )
+ if (bShow)
{
-#if wxUSE_THREADS
- wxMutexGuiLeaveOrEnter();
-#endif // wxUSE_THREADS
+ if (CanDoLayoutAdaptation())
+ DoLayoutAdaptation();
- while ( !wxTheApp->Pending() && wxTheApp->ProcessIdle() )
- ;
-
- // a message came or no more idle processing to do
- wxTheApp->DoMessage();
+ // 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();
}
- //
- // Snd 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))
+ wxDialogBase::Show(bShow);
+
+ wxString title = GetTitle();
+ if (!title.empty())
+ ::WinSetWindowText((HWND)GetHwnd(), title.c_str());
+
+ if ( bShow )
{
+ // dialogs don't get WM_SIZE message after creation unlike most (all?)
+ // other windows and so could start their life not laid out correctly
+ // if we didn't call Layout() from here
//
- // This is likely to prove that the object still exists
- //
- if (wxFindWinFromHandle((WXHWND) hWndOldFocus) == pOldFocus)
- pOldFocus->SetFocus();
+ // NB: normally we should call it just the first time but doing it
+ // every time is simpler than keeping a flag
+ Layout();
}
-} // end of wxDialog::DoShowModal
-bool wxDialog::Show(
- bool bShow
-)
+ return true;
+} // end of wxDialog::Show
+
+//
+// Replacement for Show(true) for modal dialogs - returns return code
+//
+int wxDialog::ShowModal()
{
- if (!bShow)
+ WX_HOOK_MODAL_DIALOG();
+
+ wxASSERT_MSG( !IsModal(), wxT("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 )
{
- //
- // 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
- //
- if (m_pWindowDisabler)
+ // modal dialog needs a parent window, so try to find one
+ wxWindow * const parent = GetParentForModalDialog();
+
+ // remember where the focus was
+ wxWindow *oldFocus = m_pOldFocus;
+ if ( !oldFocus )
{
- delete m_pWindowDisabler;
- m_pWindowDisabler = NULL;
+ // VZ: do we really want to do this?
+ oldFocus = parent;
}
- }
- //
- // ShowModal() may be called for already shown dialog
- //
- if (!wxDialogBase::Show(bShow) && !(bShow && IsModal()))
- {
- //
- // Nothing to do
- //
- return FALSE;
- }
+ // 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;
+
- if (bShow)
- {
//
- // Usually will result in TransferDataToWindow() being called
+ // Before entering the modal loop, reset the "is in OnIdle()" flag (see
+ // comment in app.cpp)
//
- InitDialog();
- }
+ extern bool gbInOnIdle;
+ bool bWasInOnIdle = gbInOnIdle;
- if (IsModal())
- {
- if (bShow)
+ gbInOnIdle = false;
+
+ // enter and run the modal loop
{
- //
- // 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();
+ wxDialogModalDataTiedPtr modalData(&m_modalData,
+ new wxDialogModalData(this));
+ modalData->RunLoop();
}
- else // end of modal dialog
+ 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 will cause IsModalShowing() return FALSE and our local
- // message loop will terminate
- //
- wxModalDialogs.DeleteObject(this);
+ // This is likely to prove that the object still exists
+ if (wxFindWinFromHandle((WXHWND) hwndOldFocus) == oldFocus)
+ oldFocus->SetFocus();
}
}
- return FALSE;
-} // end of wxDialog::Show
-//
-// Replacement for Show(TRUE) for modal dialogs - returns return code
-//
-int wxDialog::ShowModal()
-{
- if (!IsModal())
- {
- SetModal(TRUE);
- }
- Show(TRUE);
return GetReturnCode();
} // end of wxDialog::ShowModal
int nRetCode
)
{
- SetReturnCode(nRetCode);
- Show(FALSE);
-} // end of wxDialog::EndModal
-
-void wxDialog::OnApply(
- wxCommandEvent& rEvent
-)
-{
- if (Validate())
- TransferDataFromWindow();
-} // end of wxDialog::OnApply
+ wxASSERT_MSG( IsModal(), wxT("EndModal() called for non modal dialog") );
-// Standard buttons
-void wxDialog::OnOK(
- wxCommandEvent& rEvent
-)
-{
- if ( Validate() && TransferDataFromWindow() )
- {
- EndModal(wxID_OK);
- }
-} // end of wxDialog::OnOK
-
-void wxDialog::OnCancel(
- wxCommandEvent& rEvent
-)
-{
- EndModal(wxID_CANCEL);
-} // end of wxDialog::OnCancel
-
-void wxDialog::OnCloseWindow(
- wxCloseEvent& rEvent
-)
-{
- //
- // 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,
- // nothing will happen when you close the dialog via the window manager, or
- // via Close().
- // We wouldn't want to destroy the dialog by default, since the dialog may have been
- // created on the stack.
- // However, this does mean that calling dialog->Close() won't delete the dialog
- // unless the handler for wxID_CANCEL does so. So use Destroy() if you want to be
- // sure to destroy the dialog.
- // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog.
- //
-
- //
- // Ugh??? This is not good but until I figure out a global list it'll have to do
- //
- static wxList closing;
-
- if ( closing.Member(this) )
- return;
-
- closing.Append(this);
-
- wxCommandEvent vCancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-
- vCancelEvent.SetEventObject( this );
- GetEventHandler()->ProcessEvent(vCancelEvent); // This may close the dialog
+ m_endModalCalled = true;
+ SetReturnCode(nRetCode);
- closing.DeleteObject(this);
-} // end of wxDialog::OnCloseWindow
+ Hide();
+} // end of wxDialog::EndModal
-//
-// Destroy the window (delayed, if a managed window)
-//
-bool wxDialog::Destroy()
+MRESULT wxDialog::OS2WindowProc( WXUINT uMessage, WXWPARAM wParam, WXLPARAM lParam )
{
- 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));
- Refresh();
-} // end of wxDialog::OnSysColourChanged
-
-MRESULT wxDialog::OS2WindowProc(
- WXUINT uMessage
-, WXWPARAM wParam
-, WXLPARAM lParam
-)
-{
- MRESULT rc = 0;
- bool bProcessed = FALSE;
+ MRESULT rc = 0;
+ bool bProcessed = false;
switch (uMessage)
{
);
return rc;
} // end of wxDialog::OS2WindowProc
-
projects / wxWidgets.git / blobdiff