X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/90e572f1e5af1e51fd14e2e1e6f64fa3e258e590..e8c1be041f43e843e0e57cb1591d38664e98d43c:/src/mac/carbon/dialog.cpp diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp index 3e733e2f8d..3e812a6c94 100644 --- a/src/mac/carbon/dialog.cpp +++ b/src/mac/carbon/dialog.cpp @@ -57,9 +57,13 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id, style |= wxTAB_TRAVERSAL; if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style & ~(wxYES|wxOK|wxNO /*|wxCANCEL*/) , name) ) - return FALSE; + return false; - return TRUE; + HIViewRef growBoxRef = 0 ; + OSStatus err = HIViewFindByID( HIViewGetRoot( (WindowRef) m_macWindow ) , kHIViewWindowGrowBoxID , &growBoxRef ); + if ( err == noErr && growBoxRef != 0 ) + HIGrowBoxViewSetTransparent( growBoxRef , true ) ; + return true; } void wxDialog::SetModal(bool flag) @@ -83,8 +87,8 @@ void wxDialog::SetModal(bool flag) 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 @@ -123,7 +127,7 @@ bool wxDialog::Show(bool show) if ( !wxDialogBase::Show(show) ) { // nothing to do - return FALSE; + return false; } if ( show ) @@ -140,13 +144,13 @@ bool wxDialog::Show(bool 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 @@ -183,15 +187,13 @@ void wxDialog::DoShowModal() } -// Replacement for Show(TRUE) for modal dialogs - returns return code +// Replacement for Show(true) for modal dialogs - returns return code int wxDialog::ShowModal() { if ( !m_isModalStyle ) - { - SetModal(TRUE); - } + SetModal(true); - Show(TRUE); + Show(true); return GetReturnCode(); } @@ -200,7 +202,7 @@ int wxDialog::ShowModal() void wxDialog::EndModal(int retCode) { SetReturnCode(retCode); - Show(FALSE); + Show(false); SetModal(false); } @@ -208,15 +210,14 @@ void wxDialog::EndModal(int retCode) 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 }