/////////////////////////////////////////////////////////////////////////////
-// Name: dialog.cpp
+// Name: src/os2/dialog.cpp
// Purpose: wxDialog class
-// Author: AUTHOR
+// Author: David Webster
// Modified by:
-// Created: ??/??/98
+// Created: 10/14/99
// RCS-ID: $Id$
-// Copyright: (c) AUTHOR
-// Licence: wxWindows licence
+// Copyright: (c) David Webster
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "dialog.h"
-#endif
+// 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"
+#endif
+
+#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
+
+IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
+
+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)
-// Lists to keep track of windows, so we can disable/enable them
-// for modal dialogs
-wxList wxModalDialogs;
-wxList wxModelessWindows; // Frames and modeless dialogs
-extern wxList wxPendingDelete;
-
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel)
-
-BEGIN_EVENT_TABLE(wxDialog, wxPanel)
- 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)
+ EVT_CLOSE(wxDialog::OnCloseWindow)
END_EVENT_TABLE()
-#endif
+// ----------------------------------------------------------------------------
+// wxDialogModalData
+// ----------------------------------------------------------------------------
-wxDialog::wxDialog()
+// 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
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-}
+public:
+ wxDialogModalData(wxDialog *dialog) : m_evtLoop(dialog) { }
-bool wxDialog::Create(wxWindow *parent, wxWindowID id,
- const wxString& title,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name)
-{
- m_windowStyle = style;
+ void RunLoop()
+ {
+ m_evtLoop.Run();
+ }
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
- SetName(name);
-
- if (!parent)
- wxTopLevelWindows.Append(this);
+ void ExitLoop()
+ {
+ m_evtLoop.Exit();
+ }
- if (parent) parent->AddChild(this);
+private:
+ wxModalEventLoop m_evtLoop;
+};
- if ( id == -1 )
- m_windowId = (int)NewControlId();
- else
- m_windowId = id;
+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData);
- // TODO: create dialog
+// ============================================================================
+// implementation
+// ============================================================================
- return FALSE;
-}
+// ----------------------------------------------------------------------------
+// wxDialog construction
+// ----------------------------------------------------------------------------
-void wxDialog::SetModal(bool flag)
+void wxDialog::Init()
+{
+ m_pOldFocus = (wxWindow *)NULL;
+ m_isShown = false;
+ m_pWindowDisabler = (wxWindowDisabler *)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 )
{
- if ( flag )
- m_windowStyle |= wxDIALOG_MODAL ;
- else
- if ( m_windowStyle & wxDIALOG_MODAL )
- m_windowStyle -= wxDIALOG_MODAL ;
-
- wxModelessWindows.DeleteObject(this);
- if (!flag)
- wxModelessWindows.Append(this);
+ Init();
+ SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
+
+ //
+ // Save focus before doing anything which can potentially change it
+ //
+ m_pOldFocus = FindFocus();
+
+ //
+ // All dialogs should really have this style
+ //
+ lStyle |= wxTAB_TRAVERSAL;
+
+ if (!wxTopLevelWindow::Create( pParent
+ ,vId
+ ,rsTitle
+ ,rPos
+ ,rSize
+ ,lStyle
+ ,rsName
+ ))
+ 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
+
+// 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 WXUNUSED(bFlag)
+)
+{
+ // nothing to do, obsolete method
+} // end of wxDialog::SetModal
+
wxDialog::~wxDialog()
{
- // TODO
- wxTopLevelWindows.DeleteObject(this);
+ m_isBeingDeleted = true;
- if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL )
- wxModelessWindows.DeleteObject(this);
+ // this will also reenable all the other windows for a modal dialog
+ Show(false);
+} // end of wxDialog::~wxDialog
- // If this is the last top-level window, exit.
- if (wxTheApp && (wxTopLevelWindows.Number() == 0))
+//
+// By default, pressing escape cancels the dialog
+//
+void wxDialog::OnCharHook(
+ wxKeyEvent& rEvent
+)
+{
+ if (GetHWND())
{
- wxTheApp->SetTopWindow(NULL);
-
- if (wxTheApp->GetExitOnFrameDelete())
- {
- // TODO: exit
- }
+ 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);
+
+ //
+ // 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();
}
-// By default, pressing escape cancels the dialog
-void wxDialog::OnCharHook(wxKeyEvent& event)
-{
- if (event.m_keyCode == WXK_ESCAPE)
- {
- // Behaviour changed in 2.0: we'll send a Cancel message
- // to the dialog instead of Close.
- wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
- cancelEvent.SetEventObject( this );
- GetEventHandler()->ProcessEvent(cancelEvent);
-
- return;
- }
- // We didn't process this event.
- event.Skip();
-}
+// ----------------------------------------------------------------------------
+// showing the dialogs
+// ----------------------------------------------------------------------------
-void wxDialog::Iconize(bool WXUNUSED(iconize))
+bool wxDialog::IsModalShowing() const
{
- // TODO
-}
+ return IsModal();
+} // end of wxDialog::IsModalShowing
-bool wxDialog::IsIconized() const
-{
- // TODO
- return FALSE;
-}
-void wxDialog::SetClientSize(int width, int height)
+wxWindow *wxDialog::FindSuitableParent() const
{
- // TODO
-}
+ // first try to use the currently active window
+ HWND hwndFg = ::WinQueryActiveWindow(HWND_DESKTOP);
+ wxWindow *parent = hwndFg ? wxFindWinFromHandle((WXHWND)hwndFg)
+ : NULL;
+ if ( !parent )
+ {
+ // next try the main app window
+ parent = wxTheApp->GetTopWindow();
+ }
-void wxDialog::GetPosition(int *x, int *y) const
-{
- // TODO
-}
+ // finally, check if the parent we found is really suitable
+ if ( !parent || parent == (wxWindow *)this || !parent->IsShown() )
+ {
+ // don't use this one
+ parent = NULL;
+ }
-bool wxDialog::Show(bool show)
-{
- // TODO
- return FALSE;
+ return parent;
}
-void wxDialog::SetTitle(const wxString& title)
+bool wxDialog::Show( bool bShow )
{
- // TODO
-}
+ if ( bShow == IsShown() )
+ return false;
-wxString wxDialog::GetTitle() const
-{
- // TODO
- return wxString("");
-}
+ if (!bShow && m_modalData )
+ {
+ // 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
+ if (m_pWindowDisabler)
+ {
+ delete m_pWindowDisabler;
+ m_pWindowDisabler = NULL;
+ }
+#endif
+ }
-void wxDialog::Centre(int direction)
-{
- int x_offset,y_offset ;
- int display_width, display_height;
- int width, height, x, y;
- wxWindow *parent = GetParent();
- if ((direction & wxCENTER_FRAME) && parent)
- {
- parent->GetPosition(&x_offset,&y_offset) ;
- parent->GetSize(&display_width,&display_height) ;
- }
- else
- {
- wxDisplaySize(&display_width, &display_height);
- x_offset = 0 ;
- y_offset = 0 ;
- }
-
- GetSize(&width, &height);
- GetPosition(&x, &y);
-
- if (direction & wxHORIZONTAL)
- x = (int)((display_width - width)/2);
- if (direction & wxVERTICAL)
- y = (int)((display_height - height)/2);
-
- SetSize(x+x_offset, y+y_offset, width, height);
-}
+ 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);
+
+ wxString title = GetTitle();
+ if (!title.empty())
+ ::WinSetWindowText((HWND)GetHwnd(), (PSZ)title.c_str());
-// Replacement for Show(TRUE) for modal dialogs - returns return code
+ 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
+ //
+ // NB: normally we should call it just the first time but doing it
+ // every time is simpler than keeping a flag
+ Layout();
+ }
+
+ return true;
+} // end of wxDialog::Show
+
+//
+// Replacement for Show(true) for modal dialogs - returns return code
+//
int wxDialog::ShowModal()
{
- m_windowStyle |= wxDIALOG_MODAL;
- // TODO: modal showing
- Show(TRUE);
- return GetReturnCode();
-}
+ wxASSERT_MSG( !IsModal(), _T("wxDialog::ShowModal() reentered?") );
-void wxDialog::EndModal(int retCode)
-{
- SetReturnCode(retCode);
- // TODO modal un-showing
- Show(FALSE);
-}
+ m_endModalCalled = false;
-// Standard buttons
-void wxDialog::OnOK(wxCommandEvent& event)
-{
- if ( Validate() && TransferDataFromWindow() )
- {
- if ( IsModal() )
- EndModal(wxID_OK);
- else
+ 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 )
+ {
+ // modal dialog needs a parent window, so try to find one
+ wxWindow *parent = GetParent();
+ if ( !parent )
{
- SetReturnCode(wxID_OK);
- this->Show(FALSE);
+ parent = FindSuitableParent();
}
- }
-}
-void wxDialog::OnApply(wxCommandEvent& event)
+ // 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();
+ }
+ }
+
+ return GetReturnCode();
+} // end of wxDialog::ShowModal
+
+void wxDialog::EndModal(
+ int nRetCode
+)
{
- if (Validate())
- TransferDataFromWindow();
- // TODO probably need to disable the Apply button until things change again
-}
+ wxASSERT_MSG( IsModal(), _T("EndModal() called for non modal dialog") );
+
+ m_endModalCalled = true;
+ SetReturnCode(nRetCode);
-void wxDialog::OnCancel(wxCommandEvent& event)
+ Hide();
+} // end of wxDialog::EndModal
+
+void wxDialog::EndDialog(int rc)
{
if ( IsModal() )
- EndModal(wxID_CANCEL);
+ EndModal(rc);
else
+ Hide();
+}
+
+// ----------------------------------------------------------------------------
+// wxWin event handlers
+// ----------------------------------------------------------------------------
+
+void wxDialog::OnApply( wxCommandEvent& WXUNUSED(rEvent) )
+{
+ if (Validate())
+ TransferDataFromWindow();
+} // end of wxDialog::OnApply
+
+// Standard buttons
+void wxDialog::OnOK( wxCommandEvent& WXUNUSED(rEvent) )
+{
+ if ( Validate() && TransferDataFromWindow() )
{
- SetReturnCode(wxID_CANCEL);
- this->Show(FALSE);
+ EndDialog(wxID_OK);
}
-}
+} // end of wxDialog::OnOK
-void wxDialog::OnCloseWindow(wxCloseEvent& event)
+void wxDialog::OnCancel( wxCommandEvent& WXUNUSED(rEvent) )
{
- // We'll send a Cancel message by default,
- // which may close the dialog.
- // Check for looping if the Cancel event handler calls Close().
+ EndDialog(wxID_CANCEL);
+} // end of wxDialog::OnCancel
+void wxDialog::OnCloseWindow( wxCloseEvent& WXUNUSED(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().
// 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 cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
- cancelEvent.SetEventObject( this );
- GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog
+
+ wxCommandEvent vCancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
+
+ vCancelEvent.SetEventObject( this );
+ GetEventHandler()->ProcessEvent(vCancelEvent); // This may close the dialog
closing.DeleteObject(this);
-}
+} // end of wxDialog::OnCloseWindow
-// Destroy the window (delayed, if a managed window)
-bool wxDialog::Destroy()
+void wxDialog::OnSysColourChanged( wxSysColourChangedEvent& WXUNUSED(rEvent) )
{
- if (!wxPendingDelete.Member(this))
- wxPendingDelete.Append(this);
- return TRUE;
-}
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+ Refresh();
+} // end of wxDialog::OnSysColourChanged
-void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
+MRESULT wxDialog::OS2WindowProc( WXUINT uMessage, WXWPARAM wParam, WXLPARAM lParam )
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
- Refresh();
-}
+ MRESULT rc = 0;
+ bool bProcessed = false;
-void wxDialog::Fit()
-{
-}
+ switch (uMessage)
+ {
+ case WM_CLOSE:
+ //
+ // If we can't close, tell the system that we processed the
+ // message - otherwise it would close us
+ //
+ bProcessed = !Close();
+ break;
+ }
+
+ if (!bProcessed)
+ rc = wxWindow::OS2WindowProc( uMessage
+ ,wParam
+ ,lParam
+ );
+ return rc;
+} // end of wxDialog::OS2WindowProc
projects / wxWidgets.git / blobdiff