Partially applied patch [ 763900 ] fix for vertical toolbar

[wxWidgets.git] / src / motif / app.cpp

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index a2e569037cffca52c77e7560f2690e0542cc46bb..c391382b4730324510d6742f78b76e83e7d3b07b 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -86,7 +86,7 @@ END_EVENT_TABLE()
     }
 #endif // __WXDEBUG__
 
-bool wxApp::Initialize(int argc, wxChar **argv)
+bool wxApp::Initialize(int& argc, wxChar **argv)
 {
     if ( !wxAppBase::Initialize(argc, argv) )
         return false;
@@ -112,109 +112,9 @@ void wxApp::Exit()
 }
 
 // ============================================================================
-// wxEntry*
+// wxApp
 // ============================================================================
 
-int wxEntryStart( int argc, char* argv[] )
-{
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-    // This seems to be necessary since there are 'rogue'
-    // objects present at this point (perhaps global objects?)
-    // Setting a checkpoint will ignore them as far as the
-    // memory checking facility is concerned.
-    // Of course you may argue that memory allocated in globals should be
-    // checked, but this is a reasonable compromise.
-    wxDebugContext::SetCheckpoint();
-#endif
-
-    if (!wxApp::Initialize())
-        return -1;
-
-    return 0;
-}
-
-int wxEntryInitGui()
-{
-    int retValue = 0;
-
-    // GUI-specific initialization, such as creating an app context.
-    if (!wxTheApp->OnInitGui())
-        retValue = -1;
-
-    return retValue;
-}
-
-void wxEntryCleanup()
-{
-    // So dialog boxes aren't used for further messages
-    delete wxLog::SetActiveTarget(new wxLogStderr);
-
-    // flush the logged messages if any
-    wxLog *pLog = wxLog::GetActiveTarget();
-    if ( pLog != NULL && pLog->HasPendingMessages() )
-        pLog->Flush();
-
-    wxApp::CleanUp();
-}
-
-int wxEntry( int argc, char *argv[] )
-{
-    int retValue = 0;
-
-    retValue = wxEntryStart( argc, argv );
-    if (retValue) return retValue;
-
-    if (!wxTheApp)
-    {
-        if (!wxApp::GetInitializerFunction())
-        {
-            printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
-            return 0;
-        };
-
-        wxTheApp = (wxApp*) (* wxApp::GetInitializerFunction()) ();
-    };
-
-    if (!wxTheApp)
-    {
-        printf( "wxWindows error: wxTheApp == NULL\n" );
-        return 0;
-    };
-
-    wxTheApp->SetClassName(wxFileNameFromPath(argv[0]));
-    wxTheApp->SetAppName(wxFileNameFromPath(argv[0]));
-
-    wxTheApp->argc = argc;
-    wxTheApp->argv = argv;
-
-    // GUI-specific initialization, such as creating an app context.
-    retValue = wxEntryInitGui();
-    if (retValue) return retValue;
-
-    // Here frames insert themselves automatically into wxTopLevelWindows by
-    // getting created in OnInit().
-
-    if (wxTheApp->OnInit())
-    {
-        if (wxTheApp->Initialized())
-            wxTheApp->OnRun();
-    }
-
-    if (wxTheApp->GetTopWindow())
-    {
-        delete wxTheApp->GetTopWindow();
-        wxTheApp->SetTopWindow(NULL);
-    }
-
-    wxTheApp->DeletePendingObjects();
-
-    retValue = wxTheApp->OnExit();
-
-    wxEntryCleanup();
-
-    return retValue;
-}
-
 wxApp::wxApp()
 {
     argc = 0;
@@ -270,15 +170,6 @@ int wxApp::MainLoop()
     return 0;
 }
 
-// Processes an idle event.
-// Returns TRUE if more time is needed.
-bool wxApp::ProcessIdle()
-{
-    wxIdleEvent event;
-
-    return ProcessEvent(event) && event.MoreRequested();
-}
-
 void wxApp::ExitMainLoop()
 {
     if( m_eventLoop->IsRunning() )
@@ -351,47 +242,6 @@ void wxApp::OnIdle(wxIdleEvent& event)
     inOnIdle = FALSE;
 }
 
-// Send idle event to all top-level windows
-bool wxApp::SendIdleEvents()
-{
-    bool needMore = FALSE;
-
-    wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
-    while (node)
-    {
-        wxWindow* win = node->GetData();
-        if (SendIdleEvents(win))
-            needMore = TRUE;
-        node = node->GetNext();
-    }
-
-    return needMore;
-}
-
-// Send idle event to window and all subwindows
-bool wxApp::SendIdleEvents(wxWindow* win)
-{
-    bool needMore = FALSE;
-
-    wxIdleEvent event;
-    event.SetEventObject(win);
-    win->GetEventHandler()->ProcessEvent(event);
-
-    if (event.MoreRequested())
-        needMore = TRUE;
-
-    wxWindowList::Node* node = win->GetChildren().GetFirst();
-    while (node)
-    {
-        wxWindow* win = node->GetData();
-        if (SendIdleEvents(win))
-            needMore = TRUE;
-
-        node = node->GetNext();
-    }
-    return needMore ;
-}
-
 static char *fallbackResources[] = {
     "*menuBar.marginHeight: 0",
     "*menuBar.shadowThickness: 1",