X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1169a91932273bc84c23ed9dbd0a2da064d59d66..b156929dd096cb0c0c46cd4a5747556dde228675:/src/univ/dialog.cpp?ds=sidebyside diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp index d87d7ce8af..32feb90cac 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" @@ -46,29 +42,12 @@ END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow) -wxDialog::wxDialog() -{ - Init(); -} - -wxDialog::wxDialog(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - Init(); - Create(parent, id, title, pos, size, style, name); -} - void wxDialog::Init() { m_returnCode = 0; m_windowDisabler = NULL; m_eventLoop = NULL; - m_isShowingModal = FALSE; + m_isShowingModal = false; } wxDialog::~wxDialog() @@ -104,7 +83,7 @@ void wxDialog::OnCancel(wxCommandEvent &WXUNUSED(event)) else { SetReturnCode(wxID_CANCEL); - Show(FALSE); + Show(false); } } @@ -119,7 +98,7 @@ void wxDialog::OnOK(wxCommandEvent &WXUNUSED(event)) else { SetReturnCode(wxID_OK); - Show(FALSE); + Show(false); } } } @@ -202,9 +181,9 @@ int wxDialog::ShowModal() } } - Show(TRUE); + Show(true); - m_isShowingModal = TRUE; + m_isShowingModal = true; wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") ); @@ -234,9 +213,9 @@ void wxDialog::EndModal(int retCode) return; } - m_isShowingModal = FALSE; + m_isShowingModal = false; m_eventLoop->Exit(); - Show(FALSE); + Show(false); }