Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build fixes for wxUSE_LOG==0 (modified patch 1450207)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-04-16 22:29:47 +00:00
parent f516d98637
commit d0914b9d8d
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/zipstrm.cpp
View File

@@ -117,7 +117,7 @@ static inline wxUint32 CrackUint32(const char *m)
// //
static wxFileOffset QuietSeek(wxInputStream& stream, wxFileOffset pos) static wxFileOffset QuietSeek(wxInputStream& stream, wxFileOffset pos)
{ {
#ifdef __WXDEBUG__ #if defined(__WXDEBUG__) && wxUSE_LOG
wxLogLevel level = wxLog::GetLogLevel(); wxLogLevel level = wxLog::GetLogLevel();
wxLog::SetLogLevel(wxLOG_Debug - 1); wxLog::SetLogLevel(wxLOG_Debug - 1);
wxFileOffset result = stream.SeekI(pos); wxFileOffset result = stream.SeekI(pos);

9
src/msw/mediactrl.cpp
View File

@@ -1685,7 +1685,7 @@ enum
#define wxDL_METHOD_LOAD( lib, name, success ) \ #define wxDL_METHOD_LOAD( lib, name, success ) \
pfn_ ## name = (name ## Type) lib.GetSymbol( wxT(#name), &success ); \ pfn_ ## name = (name ## Type) lib.GetSymbol( wxT(#name), &success ); \
if (!success) { wxLog::EnableLogging(bWasLoggingEnabled); return false; } if (!success) return false
class WXDLLIMPEXP_MEDIA wxQuickTimeLibrary class WXDLLIMPEXP_MEDIA wxQuickTimeLibrary
@@ -1799,12 +1799,12 @@ bool wxQuickTimeLibrary::Initialize()
{ {
m_ok = false; m_ok = false;
// Turn off the wxDynamicLibrary logging // Turn off the wxDynamicLibrary logging as we're prepared to handle the
bool bWasLoggingEnabled = wxLog::EnableLogging(false); // errors
wxLogNull nolog;
if (!m_dll.Load(wxT("qtmlClient.dll"))) if (!m_dll.Load(wxT("qtmlClient.dll")))
{ {
wxLog::EnableLogging(bWasLoggingEnabled);
return false; return false;
} }
@@ -1864,7 +1864,6 @@ bool wxQuickTimeLibrary::Initialize()
wxDL_METHOD_LOAD( m_dll, EndUpdate, m_ok ); wxDL_METHOD_LOAD( m_dll, EndUpdate, m_ok );
wxDL_METHOD_LOAD( m_dll, GetMoviesStickyError, m_ok ); wxDL_METHOD_LOAD( m_dll, GetMoviesStickyError, m_ok );
wxLog::EnableLogging(bWasLoggingEnabled);
m_ok = true; m_ok = true;
return true; return true;