compilation fixes for wxUniv (moved wxDlgProc back to toplevel.cpp)

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

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 74f5e13cee263111b888469878bfa215d4229691..3f05639ce8b0e684d142e82b8fda3856af3861b5 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -2,62 +2,304 @@
 // Name:        app.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        app.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "app.h"
+    #pragma implementation "app.h"
+#endif
+
+#ifdef __VMS
+#include <vms_jackets.h>

 #endif
 
 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/utils.h"
 #endif
 
 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/utils.h"

-#include "wx/postscrp.h"

 #include "wx/intl.h"
 #include "wx/log.h"
 #include "wx/memory.h"
 #include "wx/font.h"
 #include "wx/settings.h"
 #include "wx/intl.h"
 #include "wx/log.h"
 #include "wx/memory.h"
 #include "wx/font.h"
 #include "wx/settings.h"

+#include "wx/dialog.h"
+
+#if wxUSE_WX_RESOURCES
+    #include "wx/resource.h"
+#endif
+
+#include "wx/module.h"
+#include "wx/image.h"
+
+#ifdef __WXUNIVERSAL__
+    #include "wx/univ/theme.h"
+    #include "wx/univ/renderer.h"
+#endif

 
 

-#include "unistd.h"
+#if wxUSE_THREADS
+    #include "wx/thread.h"
+#endif

 
 

-#ifdef USE_GDK_IMLIB
-#include "../gdk_imlib/gdk_imlib.h"
+#include <unistd.h>
+#if defined(__DARWIN__)
+// FIXME: select must be used instead of poll (GD)
+#elif defined(__VMS)
+# include <poll.h>
+#else
+# include <sys/poll.h>

 #endif
 #endif

+#include "wx/gtk/win_gtk.h"
+
+#include <gtk/gtk.h>
+

 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 

-wxApp *wxTheApp = NULL;
-wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
+wxApp *wxTheApp = (wxApp *)  NULL;
+wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;

 
 

-extern wxList wxPendingDelete;
-extern wxResourceCache *wxTheResourceCache;
+bool   g_mainThreadLocked = FALSE;
+gint   g_pendingTag = 0;
+
+static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// local functions
+// idle system
+//-----------------------------------------------------------------------------
+
+extern bool g_isIdle;
+
+void wxapp_install_idle_handler();
+
+//-----------------------------------------------------------------------------
+// wxExit
+//-----------------------------------------------------------------------------
+
+void wxExit()
+{
+    gtk_main_quit();
+}
+
+//-----------------------------------------------------------------------------
+// wxYield
+//-----------------------------------------------------------------------------
+
+// not static because used by textctrl.cpp
+//
+// MT-FIXME
+bool wxIsInsideYield = FALSE;
+
+bool wxApp::Yield(bool onlyIfNeeded)
+{
+    if ( wxIsInsideYield )
+    {
+        if ( !onlyIfNeeded )
+        {
+            wxFAIL_MSG( wxT("wxYield called recursively" ) );
+        }
+
+        return FALSE;
+    }
+
+#if wxUSE_THREADS
+    if ( !wxThread::IsMain() )
+    {
+        // can't call gtk_main_iteration() from other threads like this
+        return TRUE;
+    }
+#endif // wxUSE_THREADS
+
+    wxIsInsideYield = TRUE;
+
+    if (!g_isIdle)
+    {
+        // We need to remove idle callbacks or the loop will
+        // never finish.
+        gtk_idle_remove( m_idleTag );
+        m_idleTag = 0;
+        g_isIdle = TRUE;
+    }
+
+    // disable log flushing from here because a call to wxYield() shouldn't
+    // normally result in message boxes popping up &c
+    wxLog::Suspend();
+
+    while (gtk_events_pending())
+        gtk_main_iteration();
+
+    // It's necessary to call ProcessIdle() to update the frames sizes which
+    // might have been changed (it also will update other things set from
+    // OnUpdateUI() which is a nice (and desired) side effect). But we 
+    // call ProcessIdle() only once since this is not meant for longish
+    // background jobs (controlled by wxIdleEvent::RequestMore() and the
+    // return value of Processidle().
+    ProcessIdle();
+
+    // let the logs be flashed again
+    wxLog::Resume();
+
+    wxIsInsideYield = FALSE;
+
+    return TRUE;
+}
+
+//-----------------------------------------------------------------------------
+// wxWakeUpIdle

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-extern void wxFlushResources(void);
+void wxWakeUpIdle()
+{
+#if wxUSE_THREADS
+    if (!wxThread::IsMain())
+        wxMutexGuiEnter();
+#endif
+
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+#if wxUSE_THREADS
+    if (!wxThread::IsMain())
+        wxMutexGuiLeave();
+#endif
+}

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// global functions
+// local functions

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-void wxExit(void)
+// the callback functions must be extern "C" to comply with GTK+ declarations
+extern "C"
+{
+
+static gint wxapp_pending_callback( gpointer WXUNUSED(data) )
+{
+    if (!wxTheApp) return TRUE;
+
+    // When getting called from GDK's time-out handler
+    // we are no longer within GDK's grab on the GUI
+    // thread so we must lock it here ourselves.
+    gdk_threads_enter();
+
+    // Sent idle event to all who request them.
+    wxTheApp->ProcessPendingEvents();
+
+    g_pendingTag = 0;
+
+    // Flush the logged messages if any.
+#if wxUSE_LOG
+    wxLog::FlushActive();
+#endif // wxUSE_LOG
+
+    // Release lock again
+    gdk_threads_leave();
+
+    // Return FALSE to indicate that no more idle events are
+    // to be sent (single shot instead of continuous stream)
+    return FALSE;
+}
+
+static gint wxapp_idle_callback( gpointer WXUNUSED(data) )

 {
 {

-  gtk_main_quit();
-};
+    if (!wxTheApp)
+        return TRUE;
+
+#ifdef __WXDEBUG__
+    // don't generate the idle events while the assert modal dialog is shown,
+    // this completely confuses the apps which don't expect to be reentered
+    // from some safely-looking functions
+    if ( wxTheApp->IsInAssert() )
+    {
+        return TRUE;
+    }
+#endif // __WXDEBUG__
+
+    // When getting called from GDK's time-out handler
+    // we are no longer within GDK's grab on the GUI
+    // thread so we must lock it here ourselves.
+    gdk_threads_enter();
+
+    // Indicate that we are now in idle mode and event handlers
+    // will have to reinstall the idle handler again.
+    g_isIdle = TRUE;
+    wxTheApp->m_idleTag = 0;
+
+    // Send idle event to all who request them as long as
+    // no events have popped up in the event queue.
+    while (wxTheApp->ProcessIdle() && (gtk_events_pending() == 0))
+        ;
+
+    // Release lock again
+    gdk_threads_leave();
+
+    // Return FALSE to indicate that no more idle events are
+    // to be sent (single shot instead of continuous stream).
+    return FALSE;
+}

 
 

-bool wxYield(void)
+#if wxUSE_THREADS
+
+static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )

 {
 {

-  while (gtk_events_pending() > 0) gtk_main_iteration();
-  return TRUE;
-};
+    gint res;
+    gdk_threads_enter();
+
+    wxMutexGuiLeave();
+    g_mainThreadLocked = TRUE;
+
+#ifdef __DARWIN__
+    // FIXME: poll is not available under Darwin/Mac OS X and this needs
+    //        to be implemented using select instead (GD)
+    //        what about other BSD derived systems?
+    res = -1;
+#else
+    res = poll( (struct pollfd*) ufds, nfds, timeout );
+#endif
+
+    wxMutexGuiEnter();
+    g_mainThreadLocked = FALSE;
+
+    gdk_threads_leave();
+
+    return res;
+}
+
+#endif // wxUSE_THREADS
+
+} // extern "C"
+
+void wxapp_install_idle_handler()
+{
+    wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );
+
+    g_isIdle = FALSE;
+
+    if (g_pendingTag == 0)
+        g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL );
+
+    // This routine gets called by all event handlers
+    // indicating that the idle is over. It may also
+    // get called from other thread for sending events
+    // to the main thread (and processing these in
+    // idle time). Very low priority.
+    wxTheApp->m_idleTag = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL );
+}
+
+//-----------------------------------------------------------------------------
+// Access to the root window global
+//-----------------------------------------------------------------------------
+
+GtkWidget* wxGetRootWindow()
+{
+    if (gs_RootWindow == NULL)
+    {
+        gs_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL );
+        gtk_widget_realize( gs_RootWindow );
+    }
+    return gs_RootWindow;
+}

 
 //-----------------------------------------------------------------------------
 // wxApp
 
 //-----------------------------------------------------------------------------
 // wxApp


@@ -69,344 +311,551 @@ BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
     EVT_IDLE(wxApp::OnIdle)
 END_EVENT_TABLE()
 
     EVT_IDLE(wxApp::OnIdle)
 END_EVENT_TABLE()
 

-gint wxapp_idle_callback( gpointer WXUNUSED(data) )
-{
-  if (wxTheApp) while (wxTheApp->ProcessIdle()) {};
-  usleep( 10000 );
-  return TRUE;
-};
-

 wxApp::wxApp()
 {
 wxApp::wxApp()
 {

-  m_idleTag = 0;
-  m_topWindow = NULL;
-  m_exitOnFrameDelete = TRUE;
-};
+    m_initialized = FALSE;
+#ifdef __WXDEBUG__
+    m_isInAssert = FALSE;
+#endif // __WXDEBUG__
+
+    m_idleTag = 0;
+    wxapp_install_idle_handler();
+
+#if wxUSE_THREADS
+    g_main_set_poll_func( wxapp_poll_func );
+#endif
+
+    m_colorCube = (unsigned char*) NULL;
+    
+    // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp
+    m_glVisualInfo = (void *) NULL;
+}

 
 

-wxApp::~wxApp(void)
+wxApp::~wxApp()

 {
 {

-  gtk_idle_remove( m_idleTag );
-};
+    if (m_idleTag) gtk_idle_remove( m_idleTag );
+
+    if (m_colorCube) free(m_colorCube);
+}

 
 

-bool wxApp::OnInit(void)
+bool wxApp::OnInitGui()

 {
 {

-  return TRUE;
-};
+    if ( !wxAppBase::OnInitGui() )
+        return FALSE;
+
+    GdkVisual *visual = gdk_visual_get_system();
+
+    // if this is a wxGLApp (derived from wxApp), and we've already
+    // chosen a specific visual, then derive the GdkVisual from that
+    if (m_glVisualInfo != NULL)
+    {
+#ifdef __WXGTK20__
+        // seems gtk_widget_set_default_visual no longer exists?
+        GdkVisual* vis = gtk_widget_get_default_visual();
+#else
+        GdkVisual* vis = gdkx_visual_get( 
+            ((XVisualInfo *) m_glVisualInfo) ->visualid );
+        gtk_widget_set_default_visual( vis );
+#endif
+
+        GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
+        gtk_widget_set_default_colormap( colormap );
+
+        visual = vis;
+    }
+    
+    // On some machines, the default visual is just 256 colours, so
+    // we make sure we get the best. This can sometimes be wasteful.
+
+    else
+    if ((gdk_visual_get_best() != gdk_visual_get_system()) && (m_useBestVisual))
+    {
+#ifdef __WXGTK20__
+        /* seems gtk_widget_set_default_visual no longer exists? */
+        GdkVisual* vis = gtk_widget_get_default_visual();
+#else
+        GdkVisual* vis = gdk_visual_get_best();
+        gtk_widget_set_default_visual( vis );
+#endif
+
+        GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
+        gtk_widget_set_default_colormap( colormap );
+
+        visual = vis;
+    }
+
+    // Nothing to do for 15, 16, 24, 32 bit displays
+    if (visual->depth > 8) return TRUE;
+
+    // initialize color cube for 8-bit color reduction dithering

 
 

-bool wxApp::OnInitGui(void)
-{ 
-  m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL );
-  return TRUE; 
-};
+    GdkColormap *cmap = gtk_widget_get_default_colormap();

 
 

-int wxApp::OnRun(void) 
-{ 
-  return MainLoop(); 
-};
+    m_colorCube = (unsigned char*)malloc(32 * 32 * 32);

 
 

-bool wxApp::ProcessIdle(void)
+    for (int r = 0; r < 32; r++)
+    {
+        for (int g = 0; g < 32; g++)
+        {
+            for (int b = 0; b < 32; b++)
+            {
+                int rr = (r << 3) | (r >> 2);
+                int gg = (g << 3) | (g >> 2);
+                int bb = (b << 3) | (b >> 2);
+
+                int index = -1;
+
+                GdkColor *colors = cmap->colors;
+                if (colors)
+                {
+                    int max = 3 * 65536;
+
+                    for (int i = 0; i < cmap->size; i++)
+                    {
+                        int rdiff = ((rr << 8) - colors[i].red);
+                        int gdiff = ((gg << 8) - colors[i].green);
+                        int bdiff = ((bb << 8) - colors[i].blue);
+                        int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
+                        if (sum < max)
+                        {
+                            index = i; max = sum;
+                        }
+                    }
+                }
+                else
+                {
+                    // assume 8-bit true or static colors. this really exists
+                    GdkVisual* vis = gdk_colormap_get_visual( cmap );
+                    index = (r >> (5 - vis->red_prec)) << vis->red_shift;
+                    index |= (g >> (5 - vis->green_prec)) << vis->green_shift;
+                    index |= (b >> (5 - vis->blue_prec)) << vis->blue_shift;
+                }
+                m_colorCube[ (r*1024) + (g*32) + b ] = index;
+            }
+        }
+    }
+
+    return TRUE;
+}
+
+GdkVisual *wxApp::GetGdkVisual()
+{
+    GdkVisual *visual = NULL;
+    
+    if (m_glVisualInfo)
+        visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid );
+    else
+        visual = gdk_window_get_visual( wxGetRootWindow()->window );
+        
+    wxASSERT( visual );
+    
+    return visual;
+}
+
+bool wxApp::ProcessIdle()

 {
 {

-  wxIdleEvent event;
-  event.SetEventObject( this );
-  ProcessEvent( event );
-  
-  return event.MoreRequested();
-};
+    wxIdleEvent event;
+    event.SetEventObject( this );
+    ProcessEvent( event );
+
+    return event.MoreRequested();
+}

 
 void wxApp::OnIdle( wxIdleEvent &event )
 {
 
 void wxApp::OnIdle( wxIdleEvent &event )
 {

-  static bool inOnIdle = FALSE;
+    static bool s_inOnIdle = FALSE;

 
 

-  // Avoid recursion (via ProcessEvent default case)
-  if (inOnIdle)
-    return;
+    // Avoid recursion (via ProcessEvent default case)
+    if (s_inOnIdle)
+        return;

 
 

-  inOnIdle = TRUE;
+    s_inOnIdle = TRUE;

 
 

-  // 'Garbage' collection of windows deleted with Close().
-  DeletePendingObjects();
+    // Resend in the main thread events which have been prepared in other
+    // threads
+    ProcessPendingEvents();

 
 

-  // flush the logged messages if any
-  wxLog *pLog = wxLog::GetActiveTarget();
-  if ( pLog != NULL && pLog->HasPendingMessages() )
-    pLog->Flush();
+    // 'Garbage' collection of windows deleted with Close()
+    DeletePendingObjects();

 
 

-  // Send OnIdle events to all windows
-  bool needMore = SendIdleEvents();
+    // Send OnIdle events to all windows
+    bool needMore = SendIdleEvents();

 
 

-  if (needMore)
-    event.RequestMore(TRUE);
+    if (needMore)
+        event.RequestMore(TRUE);

 
 

-  inOnIdle = FALSE;
-};
+    s_inOnIdle = FALSE;
+}

 
 

-bool wxApp::SendIdleEvents(void)
+bool wxApp::SendIdleEvents()

 {
     bool needMore = FALSE;
 {
     bool needMore = FALSE;

-       wxNode* node = wxTopLevelWindows.First();
-       while (node)
-       {
-               wxWindow* win = (wxWindow*) node->Data();
-               if (SendIdleEvents(win))
+
+    wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
+    while (node)
+    {
+        wxWindow* win = node->GetData();
+        if (SendIdleEvents(win))

             needMore = TRUE;
             needMore = TRUE;

+            
+        node = node->GetNext();
+    }

 
 

-               node = node->Next();
-       }
+    node = wxTopLevelWindows.GetFirst();
+    while (node)
+    {
+        wxWindow* win = node->GetData();
+        CallInternalIdle( win );
+        
+        node = node->GetNext();
+    }

     return needMore;
     return needMore;

-};
+}
+
+bool wxApp::CallInternalIdle( wxWindow* win )
+{
+    win->OnInternalIdle();
+
+    wxNode* node = win->GetChildren().First();
+    while (node)
+    {
+        wxWindow* win = (wxWindow*) node->Data();
+        CallInternalIdle( win );
+
+        node = node->Next();
+    }
+    
+    return TRUE;
+}

 
 bool wxApp::SendIdleEvents( wxWindow* win )
 {
     bool needMore = FALSE;
 
 
 bool wxApp::SendIdleEvents( wxWindow* win )
 {
     bool needMore = FALSE;
 

-       wxIdleEvent event;
-       event.SetEventObject(win);
-       win->ProcessEvent(event);
+    wxIdleEvent event;
+    event.SetEventObject(win);
+
+    win->GetEventHandler()->ProcessEvent(event);

 
     if (event.MoreRequested())
         needMore = TRUE;
 
 
     if (event.MoreRequested())
         needMore = TRUE;
 

-       wxNode* node = win->GetChildren()->First();
-       while (node)
-       {
-               wxWindow* win = (wxWindow*) node->Data();
-               if (SendIdleEvents(win))
+    wxNode* node = win->GetChildren().First();
+    while (node)
+    {
+        wxWindow* win = (wxWindow*) node->Data();
+        if (SendIdleEvents(win))

             needMore = TRUE;
 
             needMore = TRUE;
 

-               node = node->Next();
-       }
-    return needMore ;
-};
+        node = node->Next();
+    }
+    
+    return needMore;
+}

 
 

-int wxApp::OnExit(void)
+int wxApp::MainLoop()

 {
 {

-  return 0;
-};
+    gtk_main();
+    return 0;
+}

 
 

-int wxApp::MainLoop(void)
+void wxApp::ExitMainLoop()

 {
 {

-  gtk_main();
-  return 0;
-};
+    if (gtk_main_level() > 0)
+        gtk_main_quit();
+}

 
 

-void wxApp::ExitMainLoop(void)
+bool wxApp::Initialized()

 {
 {

-  gtk_main_quit();
-};
+    return m_initialized;
+}

 
 

-bool wxApp::Initialized(void)
+bool wxApp::Pending()

 {
 {

-  return m_initialized;
-};
+    return (gtk_events_pending() > 0);
+}

 
 

-bool wxApp::Pending(void) 
+void wxApp::Dispatch()

 {
 {

-  return FALSE;
-};
+    gtk_main_iteration();
+}

 
 

-void wxApp::Dispatch(void) 
+void wxApp::DeletePendingObjects()

 {
 {

-};
+    wxNode *node = wxPendingDelete.First();
+    while (node)
+    {
+        wxObject *obj = (wxObject *)node->Data();

 
 

-void wxApp::DeletePendingObjects(void)
-{
-  wxNode *node = wxPendingDelete.First();
-  while (node)
-  {
-    wxObject *obj = (wxObject *)node->Data();
-    
-    delete obj;
+        delete obj;

 
 

-    if (wxPendingDelete.Member(obj))
-      delete node;
+        if (wxPendingDelete.Find(obj))
+            delete node;

 
 

-    node = wxPendingDelete.First();
-  };
-};
+        node = wxPendingDelete.First();
+    }
+}

 
 

-wxWindow *wxApp::GetTopWindow(void)
+bool wxApp::Initialize()

 {
 {

-  if (m_topWindow) return m_topWindow;
-  wxNode *node = wxTopLevelWindows.First();
-  if (!node) return NULL;
-  return (wxWindow*)node->Data();
-};
+    wxClassInfo::InitializeClasses();

 
 

-void wxApp::SetTopWindow( wxWindow *win )
-{
-  m_topWindow = win;
-};
+#if wxUSE_INTL
+    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif

 
 

-void wxApp::CommonInit(void)
-{
+    // GL: I'm annoyed ... I don't know where to put this and I don't want to
+    // create a module for that as it's part of the core.
+#if wxUSE_THREADS
+    wxPendingEvents = new wxList();
+    wxPendingEventsLocker = new wxCriticalSection();
+#endif

 
 

-/*
-#if USE_RESOURCES
-  (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion);
+    wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING );
+    wxTheColourDatabase->Initialize();
+
+    wxInitializeStockLists();
+    wxInitializeStockObjects();
+
+#if wxUSE_WX_RESOURCES
+    wxInitializeResourceSystem();

 #endif
 #endif

-*/
-  wxSystemSettings::Init();
-  wxTheResourceCache = new wxResourceCache(wxKEY_STRING);

 
 

-  wxTheFontNameDirectory =  new wxFontNameDirectory;
-  wxTheFontNameDirectory->Initialize();
+    wxModule::RegisterModules();
+    if (!wxModule::InitializeModules()) return FALSE;

 
 

-  wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
-  wxTheColourDatabase->Initialize();
+    return TRUE;
+}

 
 

-  wxInitializeStockLists();
-  wxInitializeStockObjects();
+void wxApp::CleanUp()
+{
+    wxModule::CleanUpModules();

 
 

-  // For PostScript printing
-#if USE_POSTSCRIPT
-  wxInitializePrintSetupData();
-  wxThePrintPaperDatabase = new wxPrintPaperDatabase;
-  wxThePrintPaperDatabase->CreateDatabase();
+#if wxUSE_WX_RESOURCES
+    wxCleanUpResourceSystem();

 #endif
 
 #endif
 

+    delete wxTheColourDatabase;
+    wxTheColourDatabase = (wxColourDatabase*) NULL;

 
 

-/*
-  wxBitmap::InitStandardHandlers();
+    wxDeleteStockObjects();

 
 

-  g_globalCursor = new wxCursor;
-*/
+    wxDeleteStockLists();

 
 

-//  wxInitializeStockObjects();
-};
+    delete wxTheApp;
+    wxTheApp = (wxApp*) NULL;

 
 

-void wxApp::CommonCleanUp(void)
-{
-  wxDELETE(wxTheColourDatabase);
-  wxDELETE(wxThePrintPaperDatabase);
-  wxDELETE(wxThePrintSetupData);
-  wxDELETE(wxTheFontNameDirectory);
-  wxDeleteStockObjects();
-  
-  wxFlushResources();
-
-  wxDELETE(wxTheResourceCache);
+    wxClassInfo::CleanUpClasses();

 
 

-  wxDeleteStockLists();
+#if wxUSE_THREADS
+    delete wxPendingEvents;
+    delete wxPendingEventsLocker;
+#endif

 
 

-  wxSystemSettings::Done();
-};
-    
-wxLog *wxApp::CreateLogTarget()
-{
-  return new wxLogGui;
+    // check for memory leaks
+#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+    if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
+    {
+        wxLogDebug(wxT("There were memory leaks.\n"));
+        wxDebugContext::Dump();
+        wxDebugContext::PrintStatistics();
+    }
+#endif // Debug
+
+#if wxUSE_LOG
+    // do this as the very last thing because everything else can log messages
+    wxLog::DontCreateOnDemand();
+
+    wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL );
+    if (oldLog)
+        delete oldLog;
+#endif // wxUSE_LOG

 }
 
 //-----------------------------------------------------------------------------
 // wxEntry
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // wxEntry
 //-----------------------------------------------------------------------------
 

-int wxEntry( int argc, char *argv[] )
+// NB: argc and argv may be changed here, pass by reference!
+int wxEntryStart( int& argc, char *argv[] )

 {
 {

-  wxBuffer = new char[BUFSIZ + 512];
+#if wxUSE_THREADS
+    // GTK 1.2 up to version 1.2.3 has broken threads
+    if ((gtk_major_version == 1) &&
+        (gtk_minor_version == 2) &&
+        (gtk_micro_version < 4))
+    {
+        printf( "wxWindows warning: GUI threading disabled due to outdated GTK version\n" );
+    }
+    else
+    {
+        g_thread_init(NULL);
+    }
+#endif

 
 

-  wxClassInfo::InitializeClasses();
-  
-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+    gtk_set_locale();

 
 

-#if !defined(_WINDLL)
-  streambuf* sBuf = new wxDebugStreamBuf;
+    // We should have the wxUSE_WCHAR_T test on the _outside_
+#if wxUSE_WCHAR_T
+#if defined(__WXGTK20__)
+    // gtk+ 2.0 supports Unicode through UTF-8 strings
+    wxConvCurrent = &wxConvUTF8;

 #else
 #else

-  streambuf* sBuf = NULL;
+    if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;

 #endif
 #endif

-  ostream* oStr = new ostream(sBuf) ;
-  wxDebugContext::SetStream(oStr, sBuf);
-
+#else
+    if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;

 #endif
 #endif

-  
-  if (!wxTheApp)
-  {
-    if (!wxApp::GetInitializerFunction())
+
+    gdk_threads_enter();
+
+    gtk_init( &argc, &argv );
+
+    wxSetDetectableAutoRepeat( TRUE );
+
+    if (!wxApp::Initialize())

     {
     {

-      printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
-      return 0;
-    };
-    
-    wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
-    
-    wxObject *test_app = app_ini();
-    
-    wxTheApp = (wxApp*) test_app;
-  };
-  
-  if (!wxTheApp) 
-  {
-    printf( "wxWindows error: wxTheApp == NULL\n" );
+        gdk_threads_leave();
+        return -1;
+    }
+

     return 0;
     return 0;

-  };
-
-  wxTheApp->argc = argc;
-  wxTheApp->argv = argv;
-  
-  gtk_init( &argc, &argv );
-
-#ifdef USE_GDK_IMLIB
-
-  gdk_imlib_init();
-  
-  gtk_widget_push_visual(gdk_imlib_get_visual());
-  
-  gtk_widget_push_colormap(gdk_imlib_get_colormap());
-  
-#endif  
-    
-  wxApp::CommonInit();
-
-  wxTheApp->OnInitGui();
-
-  // Here frames insert themselves automatically
-  // into wxTopLevelWindows by getting created
-  // in OnInit().
-  
-  if (!wxTheApp->OnInit()) return 0;
-
-  wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0);
-  
-  int retValue = 0;
-  
-  if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
-  
-  wxTheApp->DeletePendingObjects();  
-  
-  wxTheApp->OnExit();
-  
-  wxApp::CommonCleanUp();
-
-  wxDELETE(wxTheApp);
-  
-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_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() > 0)
-  {
-    wxTrace("There were memory leaks.\n");
-    wxDebugContext::Dump();
-    wxDebugContext::PrintStatistics();
-  }
-  wxDebugContext::SetStream(NULL, NULL);
+}
+
+
+int wxEntryInitGui()
+{
+    int retValue = 0;
+
+    if ( !wxTheApp->OnInitGui() )
+        retValue = -1;
+
+    wxGetRootWindow();
+
+    return retValue;
+}
+
+
+void wxEntryCleanup()
+{
+#if wxUSE_LOG
+    // flush the logged messages if any
+    wxLog *log = wxLog::GetActiveTarget();
+    if (log != NULL && log->HasPendingMessages())
+        log->Flush();
+
+    // continuing to use user defined log target is unsafe from now on because
+    // some resources may be already unavailable, so replace it by something
+    // more safe
+    wxLog *oldlog = wxLog::SetActiveTarget(new wxLogStderr);
+    if ( oldlog )
+        delete oldlog;
+#endif // wxUSE_LOG
+
+    wxApp::CleanUp();
+
+    gdk_threads_leave();
+}
+
+
+int wxEntry( 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
 #endif

-  
-  return retValue;
-};
+    int err = wxEntryStart(argc, argv);
+    if (err)
+        return err;

 
 

-//-----------------------------------------------------------------------------
-// main()
-//-----------------------------------------------------------------------------
+    if (!wxTheApp)
+    {
+        wxCHECK_MSG( wxApp::GetInitializerFunction(), -1,
+                     wxT("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );

 
 

-#if defined(AIX) || defined(AIX4) || defined(____HPUX__)
+        wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();

 
 

- // main in IMPLEMENT_WX_MAIN in IMPLEMENT_APP in app.h
+        wxObject *test_app = app_ini();

 
 

-#else
+        wxTheApp = (wxApp*) test_app;
+    }

 
 

-  int main(int argc, char *argv[]) { return wxEntry(argc, argv); }
+    wxCHECK_MSG( wxTheApp, -1, wxT("wxWindows error: no application object") );

 
 

+    wxTheApp->argc = argc;
+#if wxUSE_UNICODE
+    wxTheApp->argv = new wxChar*[argc+1];
+    int mb_argc = 0;
+    while (mb_argc < argc)
+    {
+        wxTheApp->argv[mb_argc] = wxStrdup(wxConvLibc.cMB2WX(argv[mb_argc]));
+        mb_argc++;
+    }
+    wxTheApp->argv[mb_argc] = (wxChar *)NULL;
+#else
+    wxTheApp->argv = argv;

 #endif
 
 #endif
 

+    wxString name(wxFileNameFromPath(argv[0]));
+    wxStripExtension( name );
+    wxTheApp->SetAppName( name );
+
+    int retValue;
+    retValue = wxEntryInitGui();
+
+    // Here frames insert themselves automatically into wxTopLevelWindows by
+    // getting created in OnInit().
+    if ( retValue == 0 )
+    {
+        if ( !wxTheApp->OnInit() )
+            retValue = -1;
+    }
+
+    if ( retValue == 0 )
+    {
+        // Delete pending toplevel windows
+        wxTheApp->DeletePendingObjects();
+
+        // When is the app not initialized ?
+        wxTheApp->m_initialized = TRUE;
+
+        if (wxTheApp->Initialized())
+        {
+            wxTheApp->OnRun();
+
+            wxWindow *topWindow = wxTheApp->GetTopWindow();
+            
+            // Delete all pending windows if any
+            wxTheApp->DeletePendingObjects();
+    
+            // Reset top window 
+            if (topWindow)
+                wxTheApp->SetTopWindow( (wxWindow*) NULL );
+
+            retValue = wxTheApp->OnExit();
+        }
+    }
+
+    wxEntryCleanup();
+
+    return retValue;
+}
+
+#ifdef __WXDEBUG__
+
+void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
+{
+    m_isInAssert = TRUE;
+
+    wxAppBase::OnAssert(file, line, msg);
+
+    m_isInAssert = FALSE;
+}
+
+#endif // __WXDEBUG__