X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..0286d08d1453506f9ff9a830d58b3b35817d0b14:/src/univ/dialog.cpp?ds=sidebyside diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp index 40b3f7efe8..50fa18cacf 100644 --- a/src/univ/dialog.cpp +++ b/src/univ/dialog.cpp @@ -14,10 +14,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "univdialog.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -25,8 +21,9 @@ #pragma hdrstop #endif +#include "wx/dialog.h" + #ifndef WX_PRECOMP - #include "wx/dialog.h" #include "wx/utils.h" #include "wx/app.h" #endif @@ -51,7 +48,7 @@ void wxDialog::Init() m_returnCode = 0; m_windowDisabler = NULL; m_eventLoop = NULL; - m_isShowingModal = FALSE; + m_isShowingModal = false; } wxDialog::~wxDialog() @@ -87,7 +84,7 @@ void wxDialog::OnCancel(wxCommandEvent &WXUNUSED(event)) else { SetReturnCode(wxID_CANCEL); - Show(FALSE); + Show(false); } } @@ -102,7 +99,7 @@ void wxDialog::OnOK(wxCommandEvent &WXUNUSED(event)) else { SetReturnCode(wxID_OK); - Show(FALSE); + Show(false); } } } @@ -185,9 +182,9 @@ int wxDialog::ShowModal() } } - Show(TRUE); + Show(true); - m_isShowingModal = TRUE; + m_isShowingModal = true; wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") ); @@ -217,9 +214,9 @@ void wxDialog::EndModal(int retCode) return; } - m_isShowingModal = FALSE; - + m_isShowingModal = false; + m_eventLoop->Exit(); - Show(FALSE); + Show(false); }