X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b22d16ad20a51052d24d538c22237c97b0ee0b53..d7b284e5c62523c9a43e26977672b4ff7c5b8981:/src/univ/dialog.cpp diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp index 4116e83c3d..32feb90cac 100644 --- a/src/univ/dialog.cpp +++ b/src/univ/dialog.cpp @@ -14,10 +14,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "univdialog.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -51,7 +47,7 @@ void wxDialog::Init() m_returnCode = 0; m_windowDisabler = NULL; m_eventLoop = NULL; - m_isShowingModal = FALSE; + m_isShowingModal = false; } wxDialog::~wxDialog() @@ -87,7 +83,7 @@ void wxDialog::OnCancel(wxCommandEvent &WXUNUSED(event)) else { SetReturnCode(wxID_CANCEL); - Show(FALSE); + Show(false); } } @@ -102,7 +98,7 @@ void wxDialog::OnOK(wxCommandEvent &WXUNUSED(event)) else { SetReturnCode(wxID_OK); - Show(FALSE); + Show(false); } } } @@ -166,11 +162,6 @@ bool wxDialog::IsModal() const return m_isShowingModal; } -void wxDialog::SetModal(bool WXUNUSED(flag)) -{ - wxFAIL_MSG( wxT("wxDialog:SetModal obsolete now") ); -} - int wxDialog::ShowModal() { if ( IsModal() ) @@ -190,15 +181,15 @@ int wxDialog::ShowModal() } } - Show(TRUE); + Show(true); - m_isShowingModal = TRUE; + m_isShowingModal = true; wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") ); -#ifdef __WXGTK__ +#if defined(__WXGTK__) || defined(__WXMGL__) wxBusyCursorSuspender suspender; - // FIXME - make sure busy cursor disappears under MSW too + // FIXME (FIXME_MGL) - make sure busy cursor disappears under MSW too #endif m_windowDisabler = new wxWindowDisabler(this); @@ -222,9 +213,9 @@ void wxDialog::EndModal(int retCode) return; } - m_isShowingModal = FALSE; + m_isShowingModal = false; m_eventLoop->Exit(); - Show(FALSE); + Show(false); }