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

log messages given during program initialization are not discarded any more

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-04-15 19:16:19 +00:00
parent 5679f3353c
commit 0151c3eb43
2 changed files with 66 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gtk/app.cpp
View File

@@ -581,18 +581,23 @@ int wxEntry( int argc, char *argv[] )
wxStripExtension( name ); wxStripExtension( name );
wxTheApp->SetAppName( name ); wxTheApp->SetAppName( name );
int retValue = 0;
if ( !wxTheApp->OnInitGui() ) if ( !wxTheApp->OnInitGui() )
return 0; retValue = -1;
// Here frames insert themselves automatically into wxTopLevelWindows by // Here frames insert themselves automatically into wxTopLevelWindows by
// getting created in OnInit(). // getting created in OnInit().
if ( retValue == 0 )
{
if ( !wxTheApp->OnInit() ) if ( !wxTheApp->OnInit() )
return 0; retValue = -1;
}
if ( retValue == 0 )
{
wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0; wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0;
int retValue = 0;
if (wxTheApp->Initialized()) if (wxTheApp->Initialized())
retValue = wxTheApp->OnRun(); retValue = wxTheApp->OnRun();
@@ -614,6 +619,7 @@ int wxEntry( int argc, char *argv[] )
} }
wxTheApp->OnExit(); wxTheApp->OnExit();
}
// flush the logged messages if any // flush the logged messages if any
wxLog *log = wxLog::GetActiveTarget(); wxLog *log = wxLog::GetActiveTarget();

14
src/gtk1/app.cpp
View File

@@ -581,18 +581,23 @@ int wxEntry( int argc, char *argv[] )
wxStripExtension( name ); wxStripExtension( name );
wxTheApp->SetAppName( name ); wxTheApp->SetAppName( name );
int retValue = 0;
if ( !wxTheApp->OnInitGui() ) if ( !wxTheApp->OnInitGui() )
return 0; retValue = -1;
// Here frames insert themselves automatically into wxTopLevelWindows by // Here frames insert themselves automatically into wxTopLevelWindows by
// getting created in OnInit(). // getting created in OnInit().
if ( retValue == 0 )
{
if ( !wxTheApp->OnInit() ) if ( !wxTheApp->OnInit() )
return 0; retValue = -1;
}
if ( retValue == 0 )
{
wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0; wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0;
int retValue = 0;
if (wxTheApp->Initialized()) if (wxTheApp->Initialized())
retValue = wxTheApp->OnRun(); retValue = wxTheApp->OnRun();
@@ -614,6 +619,7 @@ int wxEntry( int argc, char *argv[] )
} }
wxTheApp->OnExit(); wxTheApp->OnExit();
}
// flush the logged messages if any // flush the logged messages if any
wxLog *log = wxLog::GetActiveTarget(); wxLog *log = wxLog::GetActiveTarget();