More COMPATIBILITY_2_4 fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -384,7 +384,7 @@ wxLog *wxLog::GetActiveTarget()
|
|||||||
|
|
||||||
// ask the application to create a log target for us
|
// ask the application to create a log target for us
|
||||||
if ( wxTheApp != NULL )
|
if ( wxTheApp != NULL )
|
||||||
ms_pLogger = wxTheApp->CreateLogTarget();
|
ms_pLogger = wxTheApp->GetTraits()->CreateLogTarget();
|
||||||
else
|
else
|
||||||
ms_pLogger = new wxLogStderr;
|
ms_pLogger = new wxLogStderr;
|
||||||
|
|
||||||
@@ -425,7 +425,7 @@ void wxLog::RemoveTraceMask(const wxString& str)
|
|||||||
{
|
{
|
||||||
int index = ms_aTraceMasks.Index(str);
|
int index = ms_aTraceMasks.Index(str);
|
||||||
if ( index != wxNOT_FOUND )
|
if ( index != wxNOT_FOUND )
|
||||||
ms_aTraceMasks.Remove((size_t)index);
|
ms_aTraceMasks.RemoveAt((size_t)index);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxLog::ClearTraceMasks()
|
void wxLog::ClearTraceMasks()
|
||||||
|
@@ -33,6 +33,7 @@
|
|||||||
#include "wx/ffile.h"
|
#include "wx/ffile.h"
|
||||||
#include "wx/app.h"
|
#include "wx/app.h"
|
||||||
#include "wx/intl.h"
|
#include "wx/intl.h"
|
||||||
|
#include "wx/apptrait.h"
|
||||||
#if wxUSE_GUI
|
#if wxUSE_GUI
|
||||||
#include "wx/msgdlg.h"
|
#include "wx/msgdlg.h"
|
||||||
#endif // wxUSE_GUI
|
#endif // wxUSE_GUI
|
||||||
@@ -64,7 +65,7 @@ wxMessageOutput* wxMessageOutput::Get()
|
|||||||
{
|
{
|
||||||
if ( !ms_msgOut && wxTheApp )
|
if ( !ms_msgOut && wxTheApp )
|
||||||
{
|
{
|
||||||
ms_msgOut = wxTheApp->CreateMessageOutput();
|
ms_msgOut = wxTheApp->GetTraits()->CreateMessageOutput();
|
||||||
}
|
}
|
||||||
|
|
||||||
return ms_msgOut;
|
return ms_msgOut;
|
||||||
|
Reference in New Issue
Block a user