Preserve logging state during QT plugin initialization.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-06-24 15:55:10 +00:00
parent 0ccf84a67f
commit 3131207f4e

View File

@@ -742,7 +742,7 @@ struct TimeRecord {
#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(true); return false; } if (!success) { wxLog::EnableLogging(bWasLoggingEnabled); return false; }
//Class that utilizes Robert Roeblings Dynamic Library Macros //Class that utilizes Robert Roeblings Dynamic Library Macros
@@ -829,11 +829,11 @@ bool wxQuickTimeLibrary::Initialize()
{ {
m_ok = false; m_ok = false;
wxLog::EnableLogging(false); //Turn off the wxDynamicLibrary logging bool bWasLoggingEnabled = wxLog::EnableLogging(false); //Turn off the wxDynamicLibrary logging
if(!m_dll.Load(wxT("qtmlClient.dll"))) if(!m_dll.Load(wxT("qtmlClient.dll")))
{ {
wxLog::EnableLogging(true); wxLog::EnableLogging(bWasLoggingEnabled);
return false; return false;
} }
@@ -875,7 +875,7 @@ bool wxQuickTimeLibrary::Initialize()
wxDL_METHOD_LOAD( m_dll, GetMovieVolume, bOk ); wxDL_METHOD_LOAD( m_dll, GetMovieVolume, bOk );
wxDL_METHOD_LOAD( m_dll, SetMovieVolume, bOk ); wxDL_METHOD_LOAD( m_dll, SetMovieVolume, bOk );
wxLog::EnableLogging(true); wxLog::EnableLogging(bWasLoggingEnabled);
m_ok = true; m_ok = true;
return true; return true;