X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/efb064f747a2d56c3f705f305fb22a1448708e1c..0d1c8f39baaaeb7a7f757091209eab471ef5dbc4:/src/mac/carbon/dialog.cpp?ds=inline diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp index 8d23d958eb..0a478ad303 100644 --- a/src/mac/carbon/dialog.cpp +++ b/src/mac/carbon/dialog.cpp @@ -1,21 +1,24 @@ ///////////////////////////////////////////////////////////////////////////// -// 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 ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" #include "wx/dialog.h" -#include "wx/utils.h" -#include "wx/frame.h" -#include "wx/app.h" -#include "wx/settings.h" + +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/frame.h" + #include "wx/settings.h" +#endif // WX_PRECOMP #include "wx/mac/uma.h" @@ -24,8 +27,6 @@ // for modal dialogs wxList wxModalDialogs; -extern wxList wxPendingDelete; - IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow) BEGIN_EVENT_TABLE(wxDialog, wxDialogBase) @@ -65,10 +66,12 @@ bool wxDialog::Create( wxWindow *parent, 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; } @@ -169,7 +172,7 @@ void wxDialog::DoShowModal() wxModalDialogs.Append(this); SetFocus() ; - + #if TARGET_CARBON BeginAppModalStateForWindow( (WindowRef) MacGetWindowRef()) ; #else @@ -268,4 +271,3 @@ void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event)) SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); Refresh(); } -