removed wxApp::Initialized() (replaced with a dummy version in wxApp itself); wxApp in wxGTK now uses wxEvtLoop too

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-09-27 13:47:46 +00:00
parent 080a7b206c
commit dd435a79ed
22 changed files with 6 additions and 188 deletions

View File

@@ -230,14 +230,6 @@ bool wxApp::OnInit()
return TRUE;
}
bool wxApp::Initialized()
{
if (GetTopWindow())
return TRUE;
else
return FALSE;
}
void wxApp::Exit()
{
wxApp::CleanUp();

View File

@@ -270,7 +270,7 @@ void wxAppBase::ExitMainLoop()
#if wxUSE_EVTLOOP_IN_APP
// we should exit from the main event loop, not just any currently active
// (e.g. modal dialog) event loop
if ( m_mainLoop )
if ( m_mainLoop && m_mainLoop->IsRunning() )
{
m_mainLoop->Exit(0);
}

View File

@@ -399,7 +399,6 @@ END_EVENT_TABLE()
wxApp::wxApp()
{
m_initialized = FALSE;
#ifdef __WXDEBUG__
m_isInAssert = FALSE;
#endif // __WXDEBUG__
@@ -538,42 +537,6 @@ GdkVisual *wxApp::GetGdkVisual()
return visual;
}
int wxApp::MainLoop()
{
gtk_main();
return 0;
}
void wxApp::Exit()
{
// VZ: no idea why is it different from ExitMainLoop() but this is what
// wxExit() used to do
gtk_main_quit();
}
void wxApp::ExitMainLoop()
{
if (gtk_main_level() > 0)
gtk_main_quit();
}
bool wxApp::Initialized()
{
return m_initialized;
}
bool wxApp::Pending()
{
return (gtk_events_pending() > 0);
}
bool wxApp::Dispatch()
{
gtk_main_iteration();
return true;
}
bool wxApp::Initialize(int& argc, wxChar **argv)
{
#if wxUSE_THREADS

View File

@@ -399,7 +399,6 @@ END_EVENT_TABLE()
wxApp::wxApp()
{
m_initialized = FALSE;
#ifdef __WXDEBUG__
m_isInAssert = FALSE;
#endif // __WXDEBUG__
@@ -538,42 +537,6 @@ GdkVisual *wxApp::GetGdkVisual()
return visual;
}
int wxApp::MainLoop()
{
gtk_main();
return 0;
}
void wxApp::Exit()
{
// VZ: no idea why is it different from ExitMainLoop() but this is what
// wxExit() used to do
gtk_main_quit();
}
void wxApp::ExitMainLoop()
{
if (gtk_main_level() > 0)
gtk_main_quit();
}
bool wxApp::Initialized()
{
return m_initialized;
}
bool wxApp::Pending()
{
return (gtk_events_pending() > 0);
}
bool wxApp::Dispatch()
{
gtk_main_iteration();
return true;
}
bool wxApp::Initialize(int& argc, wxChar **argv)
{
#if wxUSE_THREADS

View File

@@ -1010,14 +1010,6 @@ wxApp::wxApp()
#endif
}
bool wxApp::Initialized()
{
if (GetTopWindow())
return TRUE;
else
return FALSE;
}
int wxApp::MainLoop()
{
m_keepGoing = TRUE;

View File

@@ -1010,14 +1010,6 @@ wxApp::wxApp()
#endif
}
bool wxApp::Initialized()
{
if (GetTopWindow())
return TRUE;
else
return FALSE;
}
int wxApp::MainLoop()
{
m_keepGoing = TRUE;

View File

@@ -272,11 +272,6 @@ bool wxApp::OnInitGui()
return TRUE;
}
bool wxApp::Initialized()
{
return wxTopLevelWindows.GetCount() != 0;
}
bool wxApp::Initialize(int& argc, wxChar **argv)
{
#ifdef __DJGPP__

View File

@@ -144,14 +144,6 @@ wxApp::~wxApp()
wxApp::SetInstance(NULL);
}
bool wxApp::Initialized()
{
if (GetTopWindow())
return TRUE;
else
return FALSE;
}
int wxApp::MainLoop()
{
/*
@@ -170,12 +162,6 @@ int wxApp::MainLoop()
return 0;
}
void wxApp::ExitMainLoop()
{
if( m_eventLoop->IsRunning() )
m_eventLoop->Exit();
}
// This should be redefined in a derived class for
// handling property change events for XAtom IPC.
void wxApp::HandlePropertyChange(WXEvent *event)

View File

@@ -549,18 +549,6 @@ wxApp::~wxApp()
delete [] argv;
}
bool wxApp::Initialized()
{
#ifndef _WINDLL
if (GetTopWindow())
return TRUE;
else
return FALSE;
#else // Assume initialized if DLL (no way of telling)
return TRUE;
#endif
}
void wxApp::OnIdle(wxIdleEvent& event)
{
wxAppBase::OnIdle(event);

View File

@@ -497,14 +497,6 @@ wxApp::~wxApp()
#endif
} // end of wxApp::~wxApp
bool wxApp::Initialized()
{
if (GetTopWindow())
return TRUE;
else
return FALSE;
} // end of wxApp::Initialized
bool gbInOnIdle = FALSE;
void wxApp::OnIdle(

View File

@@ -243,14 +243,6 @@ wxApp::~wxApp()
#endif
}
bool wxApp::Initialized()
{
if (GetTopWindow())
return TRUE;
else
return FALSE;
}
#if !wxUSE_NANOX
//-----------------------------------------------------------------------
// X11 predicate function for exposure compression