/////////////////////////////////////////////////////////////////////////////
-// Name: dialog.cpp
+// Name: src/mac/carbon/dialog.cpp
// Purpose: wxDialog class
// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "dialog.h"
-#endif
+#include "wx/wxprec.h"
#include "wx/dialog.h"
-#include "wx/utils.h"
-#include "wx/frame.h"
-#include "wx/app.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/app.h"
+ #include "wx/utils.h"
+ #include "wx/frame.h"
+#endif // WX_PRECOMP
+
#include "wx/settings.h"
#include "wx/mac/uma.h"
+
// 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, 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,
- const wxString& title,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name)
+bool wxDialog::Create( wxWindow *parent,
+ wxWindowID id,
+ const wxString& title,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxString& name )
{
- SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-
-
- if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
- return FALSE;
-
- MacCreateRealWindow( title , pos , size , MacRemoveBordersFromStyle(style) , name ) ;
-
- m_macWindowBackgroundTheme = kThemeBrushDialogBackgroundActive ;
- SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;
-
- return TRUE;
+ SetExtraStyle( GetExtraStyle() | wxTOPLEVEL_EX_DIALOG );
+
+ // All dialogs should really have this style...
+ style |= wxTAB_TRAVERSAL;
+
+ // ...but not these styles
+ style &= ~(wxYES | wxOK | wxNO); // | wxCANCEL
+
+ if ( !wxTopLevelWindow::Create( parent, id, title, pos, size, style, name ) )
+ return false;
+
+#if TARGET_API_MAC_OSX
+ HIViewRef growBoxRef = 0 ;
+ OSStatus err = HIViewFindByID( HIViewGetRoot( (WindowRef)m_macWindow ), kHIViewWindowGrowBoxID, &growBoxRef );
+ if ( err == noErr && growBoxRef != 0 )
+ HIGrowBoxViewSetTransparent( growBoxRef, true ) ;
+#endif
+
+ return true;
}
-void wxDialog::SetModal(bool flag)
+void wxDialog::SetModal( bool flag )
{
if ( flag )
{
- m_windowStyle |= wxDIALOG_MODAL;
-
- wxModelessWindows.DeleteObject(this);
+ m_isModalStyle = true;
+
+ wxModelessWindows.DeleteObject( this );
+
#if TARGET_CARBON
- SetWindowModality( (WindowRef) MacGetWindowRef() , kWindowModalityAppModal , NULL ) ;
+ SetWindowModality( (WindowRef)MacGetWindowRef(), kWindowModalityAppModal, NULL ) ;
#endif
}
else
{
- m_windowStyle &= ~wxDIALOG_MODAL;
-
- wxModelessWindows.Append(this);
+ 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 ||
+ if (( event.m_keyCode == WXK_ESCAPE ||
( event.m_keyCode == '.' && event.MetaDown() ) )
&& FindWindow(wxID_CANCEL) )
{
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;
}
bool wxDialog::Show(bool show)
{
if ( !wxDialogBase::Show(show) )
- {
// nothing to do
- return FALSE;
- }
+ return false;
if ( show )
- {
// usually will result in TransferDataToWindow() being called
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
void wxDialog::DoShowModal()
{
- wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
+ wxCHECK_RET( !IsModalShowing(), wxT("DoShowModal() called twice") );
wxModalDialogs.Append(this);
- wxWindow *parent = GetParent();
+ SetFocus() ;
- // remember where the focus was
- wxWindow *winFocus = FindFocus();
- if ( !winFocus )
- {
- winFocus = parent;
- }
- if ( !winFocus )
- {
- winFocus = wxTheApp->GetTopWindow();
- }
#if TARGET_CARBON
BeginAppModalStateForWindow( (WindowRef) MacGetWindowRef()) ;
#else
bool formerModal = s_macIsInModalLoop ;
s_macIsInModalLoop = true ;
#endif
+
while ( IsModalShowing() )
{
wxTheApp->MacDoOneEvent() ;
// calls process idle itself
}
-
+
#if TARGET_CARBON
EndAppModalStateForWindow( (WindowRef) MacGetWindowRef() ) ;
#else
// TODO probably reenable the parent window if any
s_macIsInModalLoop = formerModal ;
#endif
-
-
- // and restore focus
- if ( winFocus )
- {
- winFocus->SetFocus();
- }
}
-// Replacement for Show(TRUE) for modal dialogs - returns return code
+// Replacement for Show(true) for modal dialogs - returns return code
int wxDialog::ShowModal()
{
- if ( !IsModal() )
- {
- SetModal(TRUE);
- }
+ if ( !m_isModalStyle )
+ SetModal(true);
+
+ Show(true);
- Show(TRUE);
return GetReturnCode();
}
// 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& WXUNUSED(event))
{
if ( Validate() && TransferDataFromWindow() )
- {
EndModal(wxID_OK);
- }
}
void wxDialog::OnApply(wxCommandEvent& WXUNUSED(event))
{
if (Validate())
- TransferDataFromWindow();
+ TransferDataFromWindow();
+
// TODO probably need to disable the Apply button until things change again
}
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
Refresh();
}
-
projects / wxWidgets.git / blobdiff