projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clean - reformatting
[wxWidgets.git]
/
src
/
univ
/
dialog.cpp
diff --git
a/src/univ/dialog.cpp
b/src/univ/dialog.cpp
index 0f5bd5600093f5638e9a675c585fbad4b3609cee..32feb90cac49d5de9ae809f9e58efda5d5b7917d 100644
(file)
--- a/
src/univ/dialog.cpp
+++ b/
src/univ/dialog.cpp
@@
-14,10
+14,6
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "univdialog.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// 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_returnCode = 0;
m_windowDisabler = NULL;
m_eventLoop = NULL;
- m_isShowingModal =
FALSE
;
+ m_isShowingModal =
false
;
}
wxDialog::~wxDialog()
}
wxDialog::~wxDialog()
@@
-87,7
+83,7
@@
void wxDialog::OnCancel(wxCommandEvent &WXUNUSED(event))
else
{
SetReturnCode(wxID_CANCEL);
else
{
SetReturnCode(wxID_CANCEL);
- Show(
FALSE
);
+ Show(
false
);
}
}
}
}
@@
-102,7
+98,7
@@
void wxDialog::OnOK(wxCommandEvent &WXUNUSED(event))
else
{
SetReturnCode(wxID_OK);
else
{
SetReturnCode(wxID_OK);
- Show(
FALSE
);
+ Show(
false
);
}
}
}
}
}
}
@@
-166,11
+162,6
@@
bool wxDialog::IsModal() const
return m_isShowingModal;
}
return m_isShowingModal;
}
-void wxDialog::SetModal(bool WXUNUSED(flag))
-{
- wxFAIL_MSG( wxT("wxDialog:SetModal obsolete now") );
-}
-
int wxDialog::ShowModal()
{
if ( IsModal() )
int wxDialog::ShowModal()
{
if ( IsModal() )
@@
-190,14
+181,17
@@
int wxDialog::ShowModal()
}
}
}
}
- wxBusyCursorSuspender cs; // temporarily suppress the busy cursor
-
- Show(TRUE);
+ Show(true);
- m_isShowingModal =
TRUE
;
+ m_isShowingModal =
true
;
wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") );
wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") );
+#if defined(__WXGTK__) || defined(__WXMGL__)
+ wxBusyCursorSuspender suspender;
+ // FIXME (FIXME_MGL) - make sure busy cursor disappears under MSW too
+#endif
+
m_windowDisabler = new wxWindowDisabler(this);
if ( !m_eventLoop )
m_eventLoop = new wxEventLoop;
m_windowDisabler = new wxWindowDisabler(this);
if ( !m_eventLoop )
m_eventLoop = new wxEventLoop;
@@
-219,9
+213,9
@@
void wxDialog::EndModal(int retCode)
return;
}
return;
}
- m_isShowingModal =
FALSE
;
+ m_isShowingModal =
false
;
m_eventLoop->Exit();
m_eventLoop->Exit();
- Show(
FALSE
);
+ Show(
false
);
}
}