Removed unnecessary #ifs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
79132cd302
commit
072df0b3af
@ -377,10 +377,7 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
|
||||
wxTheme *theme = wxTheme::Create(themeName);
|
||||
if ( !theme )
|
||||
{
|
||||
#if wxUSE_LOG
|
||||
wxLogError(_("Unsupported theme '%s'."), themeName.c_str());
|
||||
#endif
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@ -397,9 +394,7 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
|
||||
unsigned w, h, bpp;
|
||||
if ( wxSscanf(modeDesc.c_str(), _T("%ux%u-%u"), &w, &h, &bpp) != 3 )
|
||||
{
|
||||
#if wxUSE_LOG
|
||||
wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str());
|
||||
#endif
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@ -464,9 +459,7 @@ bool wxAppBase::CheckBuildOptions(const wxBuildOptions& opts)
|
||||
msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %d.%d (%s), and your program used %d.%d (%s)."),
|
||||
verMaj, verMin, libDebug.c_str(), opts.m_verMaj, opts.m_verMin, progDebug.c_str());
|
||||
|
||||
#if wxUSE_LOG
|
||||
wxLogFatalError(msg);
|
||||
#endif
|
||||
|
||||
// normally wxLogFatalError doesn't return
|
||||
return FALSE;
|
||||
@ -557,10 +550,8 @@ void ShowAssertDialog(const wxChar *szFile,
|
||||
|
||||
if ( !s_bNoAsserts )
|
||||
{
|
||||
#if wxUSE_LOG
|
||||
// send it to the normal log destination
|
||||
wxLogDebug(szBuf);
|
||||
#endif
|
||||
|
||||
#if (wxUSE_GUI && wxUSE_MSGDLG) || defined(__WXMSW__)
|
||||
// this message is intentionally not translated - it is for
|
||||
|
Loading…
Reference in New Issue
Block a user