/////////////////////////////////////////////////////////////////////////////
// Name: dialog.cpp
// Purpose: wxDialog class
-// Author: AUTHOR
+// Author: Stefan Csomor
// Modified by:
-// Created: ??/??/98
+// Created: 1998-01-01
// RCS-ID: $Id$
-// Copyright: (c) AUTHOR
-// Licence: wxWindows licence
+// Copyright: (c) Stefan Csomor
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "dialog.h"
-#endif
+#include "wx/wxprec.h"
#include "wx/dialog.h"
#include "wx/utils.h"
//wxList wxModelessWindows; // Frames and modeless dialogs
extern wxList wxPendingDelete;
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
EVT_CLOSE(wxDialog::OnCloseWindow)
END_EVENT_TABLE()
-#endif
-
-wxDialog::wxDialog()
+void wxDialog::Init()
{
- m_isShown = FALSE;
- SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+ m_isModalStyle = false;
}
bool wxDialog::Create(wxWindow *parent, wxWindowID id,
long style,
const wxString& name)
{
+ SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
- SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-
+ // All dialogs should really have this style
+ style |= wxTAB_TRAVERSAL;
- if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
- return FALSE;
+ if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style & ~(wxYES|wxOK|wxNO /*|wxCANCEL*/) , name) )
+ return false;
- MacCreateRealWindow( title , pos , size , MacRemoveBordersFromStyle(style) , name ) ;
-
- m_macWindowBackgroundTheme = kThemeBrushDialogBackgroundActive ;
- return TRUE;
+ return true;
}
void wxDialog::SetModal(bool flag)
{
- if ( flag )
+ if ( flag )
{
- m_windowStyle |= wxDIALOG_MODAL;
+ m_isModalStyle = true;
wxModelessWindows.DeleteObject(this);
+#if TARGET_CARBON
+ SetWindowModality( (WindowRef) MacGetWindowRef() , kWindowModalityAppModal , NULL ) ;
+#endif
}
else
{
- m_windowStyle &= ~wxDIALOG_MODAL;
+ m_isModalStyle = false;
wxModelessWindows.Append(this);
}
wxDialog::~wxDialog()
{
- m_isBeingDeleted = TRUE ;
- Show(FALSE);
+ m_isBeingDeleted = true;
+ Show(false);
}
-// By default, pressing escape cancels the dialog , on mac command-stop does the same thing
+// By default, pressing escape cancels the dialog; on mac command-stop does the same thing
void wxDialog::OnCharHook(wxKeyEvent& event)
{
- if (
- ( event.m_keyCode == WXK_ESCAPE ||
- ( event.m_keyCode == '.' && event.MetaDown() ) )
- && FindWindow(wxID_CANCEL) )
- {
- // 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();
+ if (( event.m_keyCode == WXK_ESCAPE ||
+ ( event.m_keyCode == '.' && event.MetaDown() ) )
+ && FindWindow(wxID_CANCEL) )
+ {
+ // 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();
}
bool wxDialog::IsModal() const
{
- return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;
+ return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
+ // return m_isModalStyle;
}
return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
}
-extern bool s_macIsInModalLoop ;
-
bool wxDialog::Show(bool show)
{
if ( !wxDialogBase::Show(show) )
{
// nothing to do
- return FALSE;
+ return false;
}
if ( show )
InitDialog();
}
- if ( IsModal() )
+ if ( m_isModalStyle )
{
if ( show )
{
}
else // end of modal dialog
{
- // this will cause IsModalShowing() return FALSE and our local
+ // this will cause IsModalShowing() return false and our local
// message loop will terminate
wxModalDialogs.DeleteObject(this);
}
}
- return TRUE;
+ return true;
}
+#if !TARGET_CARBON
+extern bool s_macIsInModalLoop ;
+#endif
+
void wxDialog::DoShowModal()
{
wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
wxModalDialogs.Append(this);
- wxWindow *parent = GetParent();
-
- // remember where the focus was
- wxWindow *winFocus = FindFocus();
- if ( !winFocus )
- {
- winFocus = parent;
- }
- if ( !winFocus )
+ SetFocus() ;
+
+#if TARGET_CARBON
+ BeginAppModalStateForWindow( (WindowRef) MacGetWindowRef()) ;
+#else
+ // TODO : test whether parent gets disabled
+ bool formerModal = s_macIsInModalLoop ;
+ s_macIsInModalLoop = true ;
+#endif
+ while ( IsModalShowing() )
{
- winFocus = wxTheApp->GetTopWindow();
+ wxTheApp->MacDoOneEvent() ;
+ // calls process idle itself
}
- // TODO : test whether parent gets disabled
-
- bool formerModal = s_macIsInModalLoop ;
- s_macIsInModalLoop = true ;
-
- while ( IsModalShowing() )
- {
- while ( !wxTheApp->Pending() && wxTheApp->ProcessIdle() )
- {
- }
- wxTheApp->MacDoOneEvent() ;
- }
-
- s_macIsInModalLoop = formerModal ;
+#if TARGET_CARBON
+ EndAppModalStateForWindow( (WindowRef) MacGetWindowRef() ) ;
+#else
// TODO probably reenable the parent window if any
-
- // and restore focus
- if ( winFocus )
- {
- winFocus->SetFocus();
- }
+ s_macIsInModalLoop = formerModal ;
+#endif
}
-// Replacement for Show(TRUE) for modal dialogs - returns return code
+// Replacement for Show(true) for modal dialogs - returns return code
int wxDialog::ShowModal()
{
- m_windowStyle |= wxDIALOG_MODAL;
- Show(TRUE);
- return GetReturnCode();
+ if ( !m_isModalStyle )
+ SetModal(true);
+
+ Show(true);
+ return GetReturnCode();
}
// NB: this function (surprizingly) may be called for both modal and modeless
// dialogs and should work for both of them
void wxDialog::EndModal(int retCode)
{
- SetReturnCode(retCode);
- Show(FALSE);
+ SetReturnCode(retCode);
+ Show(false);
+ SetModal(false);
}
// Standard buttons
-void wxDialog::OnOK(wxCommandEvent& event)
+void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))
{
if ( Validate() && TransferDataFromWindow() )
- {
EndModal(wxID_OK);
- }
}
-void wxDialog::OnApply(wxCommandEvent& event)
+void wxDialog::OnApply(wxCommandEvent& WXUNUSED(event))
{
if (Validate())
- TransferDataFromWindow();
+ TransferDataFromWindow();
+
// TODO probably need to disable the Apply button until things change again
}
-void wxDialog::OnCancel(wxCommandEvent& event)
+void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
{
- EndModal(wxID_CANCEL);
+ EndModal(wxID_CANCEL);
}
-void wxDialog::OnCloseWindow(wxCloseEvent& event)
+void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
{
// We'll send a Cancel message by default,
// which may close the dialog.
closing.DeleteObject(this);
}
-void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
+void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
{
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
Refresh();
projects / wxWidgets.git / blobdiff