WX_DEFINE_OBJARRAY(wxMsgArray);
#endif // wxUSE_THREADS
-#if wxUSE_WX_RESOURCES
- #include "wx/resource.h"
-#endif
-
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
#endif // wxUSE_TOOLTIPS
HAB vHabmain = NULLHANDLE;
QMSG svCurrentMsg;
-wxApp* wxTheApp = NULL;
HICON wxSTD_FRAME_ICON = (HICON) NULL;
//
// Initialize
//
-bool wxApp::Initialize(
- HAB vHab
-)
+bool wxApp::Initialize(int& argc, wxChar **argv)
{
+ if ( !wxAppBase::Initialize(argc, argv) )
+ return false;
+
#if defined(wxUSE_CONSOLEDEBUG)
#if wxUSE_CONSOLEDEBUG
/***********************************************/
#endif //wxUSE_CONSOLEDEBUG
#endif
- wxBuffer = new wxChar[1500]; // FIXME; why?
-
- wxClassInfo::InitializeClasses();
-
-#if wxUSE_THREADS
- wxPendingEventsLocker = new wxCriticalSection;
-#endif
-
- wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
- wxTheColourDatabase->Initialize();
-
- wxInitializeStockLists();
- wxInitializeStockObjects();
-
-#if wxUSE_WX_RESOURCES
- wxInitializeResourceSystem();
-#endif
-
- wxBitmap::InitStandardHandlers();
-
//
// OS2 has to have an anchorblock
//
- vHab = WinInitialize(0);
+ vHabmain = WinInitialize(0);
+
+ if (!vHabmain)
+ {
+ // TODO: at least give some error message here...
+ wxAppBase::CleanUp();
- if (!vHab)
return FALSE;
- else
- vHabmain = vHab;
+ }
+
+ wxBuffer = new wxChar[1500]; // FIXME; why?
// Some people may wish to use this, but
// probably it shouldn't be here by default.
// wxSetKeyboardHook(TRUE);
- wxModule::RegisterModules();
- if (!wxModule::InitializeModules())
- return FALSE;
RegisterWindowClasses(vHab);
+
return TRUE;
} // end of wxApp::Initialize
//
void wxApp::CleanUp()
{
- //
- // COMMON CLEANUP
- //
-
-#if wxUSE_LOG
-
- //
- // Flush the logged messages if any and install a 'safer' log target: the
- // default one (wxLogGui) can't be used after the resources are freed just
- // below and the user suppliedo ne might be even more unsafe (using any
- // wxWindows GUI function is unsafe starting from now)
- //
- wxLog::DontCreateOnDemand();
-
- //
- // This will flush the old messages if any
- //
- delete wxLog::SetActiveTarget(new wxLogStderr);
-#endif // wxUSE_LOG
-
- //
- // One last chance for pending objects to be cleaned up
- //
- wxTheApp->DeletePendingObjects();
-
- wxModule::CleanUpModules();
-
-#if wxUSE_WX_RESOURCES
- wxCleanUpResourceSystem();
-#endif
-
- wxDeleteStockObjects();
-
- //
- // Destroy all GDI lists, etc.
- //
- wxDeleteStockLists();
-
- delete wxTheColourDatabase;
- wxTheColourDatabase = NULL;
-
- wxBitmap::CleanUpHandlers();
-
delete[] wxBuffer;
wxBuffer = NULL;
((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
#endif
- wxClassInfo::CleanUpClasses();
-
// Delete Message queue
if (wxTheApp->m_hMq)
::WinDestroyMsgQueue(wxTheApp->m_hMq);
- delete wxTheApp;
- wxTheApp = NULL;
-
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
- // At this point we want to check if there are any memory
- // blocks that aren't part of the wxDebugContext itself,
- // as a special case. Then when dumping we need to ignore
- // wxDebugContext, too.
- if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
- {
- wxLogDebug(wxT("There were memory leaks."));
- wxDebugContext::Dump();
- wxDebugContext::PrintStatistics();
- }
- // wxDebugContext::SetStream(NULL, NULL);
-#endif
-
-#if wxUSE_LOG
- // do it as the very last thing because everything else can log messages
- delete wxLog::SetActiveTarget(NULL);
-#endif // wxUSE_LOG
+ wxAppBase::CleanUp();
} // end of wxApp::CleanUp
-//----------------------------------------------------------------------
-// Main wxWindows entry point
-//----------------------------------------------------------------------
-int wxEntry(
- int argc
-, char* argv[]
-)
-{
- HAB vHab = 0;
-
- if (!wxApp::Initialize(vHab))
- return 0;
-
- //
- // create the application object or ensure that one already exists
- //
- if (!wxTheApp)
- {
- // The app may have declared a global application object, but we recommend
- // the IMPLEMENT_APP macro is used instead, which sets an initializer
- // function for delayed, dynamic app object construction.
- wxCHECK_MSG( wxApp::GetInitializerFunction(), 0,
- wxT("No initializer - use IMPLEMENT_APP macro.") );
- wxTheApp = (*wxApp::GetInitializerFunction()) ();
- }
- wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") );
- wxTheApp->argc = argc;
-
-#if wxUSE_UNICODE
- wxTheApp->argv = new wxChar*[argc+1];
-
- int nArgc = 0;
-
- while (nArgc < argc)
- {
- wxTheApp->argv[nArgc] = wxStrdup(wxConvLibc.cMB2WX(argv[nArgc]));
- nArgc++;
- }
- wxTheApp->argv[nArgc] = (wxChar *)NULL;
-#else
- wxTheApp->argv = argv;
-#endif
-
- wxString sName(wxFileNameFromPath(argv[0]));
-
- wxStripExtension(sName);
- wxTheApp->SetAppName(sName);
-
- int nRetValue = 0;
-
- if (!wxTheApp->OnInitGui())
- nRetValue = -1;
-
- if (nRetValue == 0)
- {
- if (wxTheApp->OnInit())
- {
- nRetValue = wxTheApp->OnRun();
- }
- // Normal exit
- wxWindow* pTopWindow = wxTheApp->GetTopWindow();
- if (pTopWindow)
- {
- // Forcibly delete the window.
- if (pTopWindow->IsKindOf(CLASSINFO(wxFrame)) ||
- pTopWindow->IsKindOf(CLASSINFO(wxDialog)) )
- {
- pTopWindow->Close(TRUE);
- wxTheApp->DeletePendingObjects();
- }
- else
- {
- delete pTopWindow;
- wxTheApp->SetTopWindow(NULL);
- }
- }
- }
- else // app initialization failed
- {
- wxLogLastError(" Gui initialization failed, exitting");
- }
-#if wxUSE_CONSOLEDEBUG
- printf("wxTheApp->OnExit ");
- fflush(stdout);
-#endif
- wxTheApp->OnExit();
-#if wxUSE_CONSOLEDEBUG
- printf("wxApp::CleanUp ");
- fflush(stdout);
-#endif
- wxApp::CleanUp();
-#if wxUSE_CONSOLEDEBUG
- printf("return %i ", nRetValue);
- fflush(stdout);
-#endif
- return(nRetValue);
-} // end of wxEntry
-
bool wxApp::OnInitGui()
{
ERRORID vError;
return TRUE;
} // end of wxApp::OnInitGui
-//
-// Static member initialization
-//
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
-
wxApp::wxApp()
{
m_topWindow = NULL;
return FALSE;
} // end of wxApp::ProcessMessage
+bool gbInOnIdle = FALSE;
+
void wxApp::OnIdle(
wxIdleEvent& rEvent
)
{
- static bool sbInOnIdle = FALSE;
//
// Avoid recursion (via ProcessEvent default case)
//
- if (sbInOnIdle)
+ if (gbInOnIdle)
return;
- sbInOnIdle = TRUE;
+ gbInOnIdle = TRUE;
//
// If there are pending events, we must process them: pending events
//
rEvent.RequestMore(TRUE);
}
- sbInOnIdle = FALSE;
+ gbInOnIdle = FALSE;
} // end of wxApp::OnIdle
// Send idle event to all top-level windows
return bNeedMore;
} // end of wxApp::SendIdleEvents
-void wxApp::DeletePendingObjects()
-{
- wxNode* pNode = wxPendingDelete.First();
-
- while (pNode)
- {
- wxObject* pObj = (wxObject *)pNode->Data();
-
- delete pObj;
-
- if (wxPendingDelete.Member(pObj))
- delete pNode;
-
- //
- // Deleting one object may have deleted other pending
- // objects, so start from beginning of list again.
- //
- pNode = wxPendingDelete.First();
- }
-} // end of wxApp::DeletePendingObjects
-
void wxApp::OnEndSession(
wxCloseEvent& WXUNUSED(rEvent))
{
}
} // end of wxApp::OnQueryEndSession
-void wxExit()
+void wxApp::Exit()
{
- wxLogError(_("Fatal error: exiting"));
-
wxApp::CleanUp();
+
+ // VZ: must really exit somehow, insert appropriate OS/2 syscall (FIXME)
+ wxAppConsole::Exit();
} // end of wxExit
//
// wxWakeUpIdle
//-----------------------------------------------------------------------------
-void wxWakeUpIdle()
+void wxApp::WakeUpIdle()
{
//
// Send the top window a dummy message so idle handler processing will
projects / wxWidgets.git / blobdiff