wxSplitPath() bugs corrected and it's documented

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 2317ad532011f25cd4bb2b95242458d45468044b..0f4c0825c3a510f4f8f93106b3d5491874f5bd2a 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -2,10 +2,9 @@
 // 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__


@@ -15,25 +14,114 @@
 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/utils.h"
 #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/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"
+#if wxUSE_THREADS
+#include "wx/thread.h"
+#endif

 #include "unistd.h"
 
 #include "unistd.h"
 

-#ifdef USE_GDK_IMLIB
-#include "../gdk_imlib/gdk_imlib.h"
+// add more here if you run into problems
+#if defined(__SUN__) && !defined(__SunOs_5_6) && !defined(__SunOs_5_7) && !defined(__SUNPRO_CC)
+extern "C" 
+{
+void usleep(unsigned long usec); 
+};

 #endif
 
 #endif
 

+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#include "wx/gtk/win_gtk.h"
+
+#include   <unistd.h> // usleep() on solaris
+

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

-wxApp *wxTheApp = NULL;
+wxApp *wxTheApp = (wxApp *)  NULL;

 wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
 
 extern wxList wxPendingDelete;
 wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
 
 extern wxList wxPendingDelete;

+extern wxResourceCache *wxTheResourceCache;
+
+unsigned char g_palette[64*3] =
+{
+  0x0,  0x0,  0x0,
+  0xff, 0xff, 0xff,
+  0xff, 0x0,  0x0,
+  0xff, 0xff, 0x0,
+  0x0,  0xff, 0x0,
+  0x0,  0x0,  0xff,
+  0x0,  0xff, 0xff,
+  0x99, 0x99, 0x99,
+  0xff, 0x88, 0x0,
+  0x88, 0x0,  0x0,
+  0x0,  0x88, 0x88,
+  0x88, 0x88, 0x0,
+  0xff, 0xcc, 0x97,
+  0xbb, 0xbb, 0xbb,
+  0x9f, 0x6b, 0x42,
+  0x55, 0x55, 0x55,
+  0xdd, 0xdd, 0xdd,
+  0x77, 0x77, 0x77,
+  0x33, 0x33, 0x33,
+  0xcc, 0x0,  0x0,
+  0xff, 0x44, 0x0,
+  0xff, 0xcc, 0x0,
+  0xcc, 0xcc, 0x0,
+  0x60, 0x60, 0x0,
+  0x0,  0x43, 0x0,
+  0x0,  0x7f, 0x0,
+  0x0,  0xcc, 0x0,
+  0x0,  0x44, 0x44,
+  0x0,  0x0,  0x44,
+  0x0,  0x0,  0x88,
+  0xef, 0xb1, 0x7b,
+  0xdf, 0x98, 0x5f,
+  0xbf, 0x87, 0x56,
+  0x7f, 0x57, 0x26,
+  0x5f, 0x39, 0xc,
+  0x3f, 0x1c, 0x0,
+  0x21, 0x0,  0x0,
+  0x0,  0x43, 0x87,
+  0x2d, 0x70, 0xaf,
+  0x5a, 0x9e, 0xd7,
+  0x87, 0xcc, 0xff,
+  0xff, 0xe0, 0xba,
+  0x21, 0x43, 0xf,
+  0x3d, 0x5d, 0x25,
+  0x59, 0x78, 0x3a,
+  0x75, 0x93, 0x4f,
+  0x91, 0xae, 0x64,
+  0xad, 0xc8, 0x7a,
+  0xf0, 0xa8, 0xef,
+  0xd0, 0x88, 0xd0,
+  0xaf, 0x66, 0xaf,
+  0x8e, 0x44, 0x8e,
+  0x6d, 0x22, 0x6d,
+  0x4b, 0x0,  0x4b,
+  0xff, 0xc0, 0xbc,
+  0xff, 0x93, 0x91,
+  0xff, 0x66, 0x67,
+  0xd8, 0xf2, 0xbf,
+  0xff, 0xc9, 0x68,
+  0xff, 0x96, 0x67,
+  0xa5, 0x60, 0xff,
+  0x51, 0xff, 0x99,
+  0x3f, 0xa5, 0x63,
+  0x98, 0x90, 0x67
+};

 
 //-----------------------------------------------------------------------------
 // local functions
 
 //-----------------------------------------------------------------------------
 // local functions


@@ -47,14 +135,14 @@ extern void wxFlushResources(void);
 
 void wxExit(void)
 {
 
 void wxExit(void)
 {

-  gtk_main_quit();
-};
+    gtk_main_quit();
+}

 
 bool wxYield(void)
 {
 
 bool wxYield(void)
 {

-  while (gtk_events_pending() > 0) gtk_main_iteration();
-  return TRUE;
-};
+    while (gtk_events_pending() > 0) gtk_main_iteration();
+    return TRUE;
+}

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


@@ -68,212 +156,328 @@ END_EVENT_TABLE()
 
 gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {
 
 gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {

-  if (wxTheApp) while (wxTheApp->ProcessIdle()) {};
-  usleep( 10000 );
-  return TRUE;
-};
+    if (wxTheApp) while (wxTheApp->ProcessIdle()) {}
+#if wxUSE_THREADS
+    wxMutexGuiLeave();
+#endif
+    usleep(10000);
+#if wxUSE_THREADS
+    wxMutexGuiEnter();
+#endif
+    return TRUE;
+}

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

-  m_idleTag = 0;
-  m_topWindow = NULL;
-  m_exitOnFrameDelete = TRUE;
-};
+    wxTheApp = this;
+    
+    m_topWindow = (wxWindow *) NULL;
+    m_exitOnFrameDelete = TRUE;
+    
+    m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
+    
+    m_colorCube = (unsigned char*) NULL;
+}

 
 wxApp::~wxApp(void)
 {
 
 wxApp::~wxApp(void)
 {

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

 
 

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

 {
 {

-  return TRUE;
-};
+    /* Nothing to do for 15, 16, 24, 32 bit displays */

 
 

-bool wxApp::OnInitGui(void)
-{ 
-  m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL );
-  return TRUE; 
-};
+    GdkVisual *visual = gdk_visual_get_system();
+    if (visual->depth > 8) return TRUE;
+    
+        /* this initiates the standard palette as defined by GdkImlib
+           in the GNOME libraries. it ensures that all GNOME applications
+           use the same 64 colormap entries on 8-bit displays so you
+           can use several rather graphics-heavy applications at the
+           same time.
+          NOTE: this doesn't really seem to work this way... */
+
+        /*
+        GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE );
+
+        for (int i = 0; i < 64; i++)
+        {
+            GdkColor col;
+            col.red    = g_palette[i*3 + 0] << 8;
+            col.green  = g_palette[i*3 + 1] << 8;
+            col.blue   = g_palette[i*3 + 2] << 8;
+            col.pixel  = 0;
+
+            gdk_color_alloc( cmap, &col );
+        }
+       
+        gtk_widget_set_default_colormap( cmap );
+        */
+    
+    /* initialize color cube for 8-bit color reduction dithering */
+    
+    GdkColormap *cmap = gtk_widget_get_default_colormap();
+    
+    m_colorCube = (unsigned char*)malloc(32 * 32 * 32);

 
 

-int wxApp::OnRun(void) 
-{ 
-  return MainLoop(); 
-};
+     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);
+               
+                GdkColor *colors = cmap->colors;
+                int max = 3 * (65536);
+                int index = -1;
+
+                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; }
+                }
+               
+               m_colorCube[ (r*1024) + (g*32) + b ] = index;
+           }
+       }
+    }
+
+    
+    return TRUE;
+}

 
 bool wxApp::ProcessIdle(void)
 {
 
 bool wxApp::ProcessIdle(void)
 {

-  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 inOnIdle = FALSE;

 
 

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

 
 

-  inOnIdle = TRUE;
+    inOnIdle = TRUE;

 
 

-  // 'Garbage' collection of windows deleted with Close().
-  DeletePendingObjects();
+    /* 'Garbage' collection of windows deleted with Close(). */
+    DeletePendingObjects();

 
 

-  // flush the logged messages if any
-  wxLog *pLog = wxLog::GetActiveTarget();
-  if ( pLog != NULL && pLog->HasPendingMessages() )
-    pLog->Flush();
+    /* flush the logged messages if any */
+    wxLog *log = wxLog::GetActiveTarget();
+    if (log != NULL && log->HasPendingMessages())
+        log->Flush();

 
 

-  // 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;
-};
+    inOnIdle = FALSE;
+}

 
 bool wxApp::SendIdleEvents(void)
 {
     bool needMore = FALSE;
 
 bool wxApp::SendIdleEvents(void)
 {
     bool needMore = FALSE;

-       wxNode* node = wxTopLevelWindows.First();
-       while (node)
-       {
-               wxWindow* win = (wxWindow*) node->Data();
-               if (SendIdleEvents(win))
-            needMore = TRUE;

 
 

-               node = node->Next();
-       }
+    wxNode* node = wxTopLevelWindows.First();
+    while (node)
+    {
+        wxWindow* win = (wxWindow*) node->Data();
+        if (SendIdleEvents(win))
+            needMore = TRUE;
+        node = node->Next();
+    }

     return needMore;
     return needMore;

-};
+}

 
 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->OnInternalIdle();
+    
+    win->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();
-       }
+        node = node->Next();
+    }

     return needMore ;
     return needMore ;

-};
-
-int wxApp::OnExit(void)
-{
-  return 0;
-};
+}

 
 int wxApp::MainLoop(void)
 {
 
 int wxApp::MainLoop(void)
 {

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

 
 void wxApp::ExitMainLoop(void)
 {
 
 void wxApp::ExitMainLoop(void)
 {

-  gtk_main_quit();
-};
+    gtk_main_quit();
+}

 
 bool wxApp::Initialized(void)
 {
 
 bool wxApp::Initialized(void)
 {

-  return m_initialized;
-};
+    return m_initialized;
+}

 
 

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

 {
 {

-  return FALSE;
-};
+    return FALSE;
+}

 
 

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

 {
 {

-};
+}

 
 void wxApp::DeletePendingObjects(void)
 {
 
 void wxApp::DeletePendingObjects(void)
 {

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

 
 

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

 
 

-    node = wxPendingDelete.First();
-  };
-};
+        if (wxPendingDelete.Member(obj))
+        delete node;
+
+        node = wxPendingDelete.First();
+    }
+}

 
 wxWindow *wxApp::GetTopWindow(void)
 {
 
 wxWindow *wxApp::GetTopWindow(void)
 {

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

 
 void wxApp::SetTopWindow( wxWindow *win )
 {
 
 void wxApp::SetTopWindow( wxWindow *win )
 {

-  m_topWindow = win;
-};
+    m_topWindow = win;
+}

 
 

-void wxApp::CommonInit(void)
+bool wxApp::Initialize(void)

 {
 {

+    wxBuffer = new char[BUFSIZ + 512];

 
 

+    wxClassInfo::InitializeClasses();
+    
+    wxSystemSettings::Init();
+  

 /*
 /*

-#if USE_RESOURCES
-  (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion);
-#endif
+    wxTheFontNameDirectory =  new wxFontNameDirectory;
+    wxTheFontNameDirectory->Initialize();

 */
 
 */
 

-  wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
-  wxTheColourDatabase->Initialize();
-  wxInitializeStockObjects();
+    wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING );
+    wxTheColourDatabase->Initialize();

 
 

-  // For PostScript printing
-#if USE_POSTSCRIPT
-  wxInitializePrintSetupData();
-  wxThePrintPaperDatabase = new wxPrintPaperDatabase;
-  wxThePrintPaperDatabase->CreateDatabase();
+    wxInitializeStockLists();
+    wxInitializeStockObjects();
+
+#if wxUSE_WX_RESOURCES
+    wxTheResourceCache = new wxResourceCache( wxKEY_STRING );
+  
+    wxInitializeResourceSystem();

 #endif
 
 #endif
 

+    wxImage::InitStandardHandlers();

 
 

-/*
-  wxBitmap::InitStandardHandlers();
+    /* no global cursor under X
+       g_globalCursor = new wxCursor; */
+       
+    wxModule::RegisterModules();
+    if (!wxModule::InitializeModules()) return FALSE;
+    
+    return TRUE;
+}
+
+void wxApp::CleanUp(void)
+{
+    wxModule::CleanUpModules();
+
+#if wxUSE_WX_RESOURCES
+    wxFlushResources();
+
+    if (wxTheResourceCache) delete wxTheResourceCache;
+    wxTheResourceCache = (wxResourceCache*) NULL;
+    
+    wxCleanUpResourceSystem();
+#endif

 
 

-  g_globalCursor = new wxCursor;
+    if (wxTheColourDatabase) delete wxTheColourDatabase;
+    wxTheColourDatabase = (wxColourDatabase*) NULL;
+    
+/*
+    if (wxTheFontNameDirectory) delete wxTheFontNameDirectory;
+    wxTheFontNameDirectory = (wxFontNameDirectory*) NULL;

 */
 */

+    
+    wxDeleteStockObjects();

 
 

-  wxInitializeStockObjects();
-};
+    wxDeleteStockLists();

 
 

-void wxApp::CommonCleanUp(void)
-{
-  wxDeleteStockObjects();
-  
-  wxFlushResources();
-};
+    wxImage::CleanUpHandlers();
+
+    delete wxTheApp;
+    wxTheApp = (wxApp*) NULL;
+
+    wxSystemSettings::Done();
+    
+    delete[] wxBuffer;
+
+    wxClassInfo::CleanUpClasses();
+    
+    /* check for memory leaks */
+#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+    if (wxDebugContext::CountObjectsLeft() > 0)
+    {
+        wxLogDebug("There were memory leaks.\n");
+        wxDebugContext::Dump();
+        wxDebugContext::PrintStatistics();
+    }
+#endif
+
+    /* 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;
+}
+

 wxLog *wxApp::CreateLogTarget()
 {
 wxLog *wxApp::CreateLogTarget()
 {

-  return new wxLogGui;
+    return new wxLogGui;

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -282,113 +486,82 @@ wxLog *wxApp::CreateLogTarget()
 
 int wxEntry( int argc, char *argv[] )
 {
 
 int wxEntry( int argc, char *argv[] )
 {

-  wxBuffer = new char[BUFSIZ + 512];
+    gtk_set_locale();

 
 

-  wxClassInfo::InitializeClasses();
-  
-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+    gtk_init( &argc, &argv );

 
 

-#if !defined(_WINDLL)
-  streambuf* sBuf = new wxDebugStreamBuf;
-#else
-  streambuf* sBuf = NULL;
-#endif
-  ostream* oStr = new ostream(sBuf) ;
-  wxDebugContext::SetStream(oStr, sBuf);
+    if (!wxApp::Initialize()) return 0;

 
 

-#endif
-  
-  if (!wxTheApp)
-  {
-    if (!wxApp::GetInitializerFunction())
+    if (!wxTheApp)

     {
     {

-      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;
-    
-//    wxTheApp = (wxApp*)( app_ini() );
-  };
-  
-  if (!wxTheApp) 
-  {
-    printf( "wxWindows error: wxTheApp == NULL\n" );
-    return 0;
-  };
+        if (!wxApp::GetInitializerFunction())
+        {
+            printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
+            return 0;
+        }

 
 

-//  printf( "Programmstart.\n" );
-  
-  wxTheApp->argc = argc;
-  wxTheApp->argv = argv;
-  
-  gtk_init( &argc, &argv );
+        wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();

 
 

-#ifdef USE_GDK_IMLIB
+        wxObject *test_app = app_ini();

 
 

-  gdk_imlib_init();
-  
-  gtk_widget_push_visual(gdk_imlib_get_visual());
-  
-  gtk_widget_push_colormap(gdk_imlib_get_colormap());
-  
-#endif  
-    
-  wxApp::CommonInit();
+        wxTheApp = (wxApp*) test_app;
+    }

 
 

-  wxTheApp->OnInitGui();
+    if (!wxTheApp)
+    {
+        printf( "wxWindows error: wxTheApp == NULL\n" );
+        return 0;
+    }

 
 

-  // Here frames insert themselves automatically
-  // into wxTopLevelWindows by getting created
-  // in OnInit().
-  
-  if (!wxTheApp->OnInit()) return 0;
+    wxTheApp->argc = argc;
+    wxTheApp->argv = argv;

 
 

-  wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0);
-  
-  int retValue = 0;
-  
-  if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
-  
-  wxTheApp->DeletePendingObjects();  
-  
-  wxTheApp->OnExit();
-  
-  wxApp::CommonCleanUp();
-  
-#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);
-#endif
-  
-  return retValue;
-};
+    char name[200];
+    strcpy( name, argv[0] );
+    strcpy( name, wxFileNameFromPath(name) );
+    wxStripExtension( name );
+    wxTheApp->SetAppName( name );

 
 

-//-----------------------------------------------------------------------------
-// main()
-//-----------------------------------------------------------------------------
+    if (!wxTheApp->OnInitGui()) return 0;

 
 

-#if defined(AIX) || defined(AIX4) || defined(____HPUX__)
+    /* Here frames insert themselves automatically
+     * into wxTopLevelWindows by getting created
+     * in OnInit(). */

 
 

- // main in IMPLEMENT_WX_MAIN in IMPLEMENT_APP in app.h
+    if (!wxTheApp->OnInit()) return 0;

 
 

-#else
+    wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0);

 
 

-  int main(int argc, char *argv[]) { return wxEntry(argc, argv); }
+    int retValue = 0;

 
 

-#endif
+    if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();

 
 

+    wxWindow *topWindow = wxTheApp->GetTopWindow();
+    if (topWindow)
+    {
+        /* Forcibly delete the window. */
+        if (topWindow->IsKindOf(CLASSINFO(wxFrame)) ||
+            topWindow->IsKindOf(CLASSINFO(wxDialog)) )
+        {
+            topWindow->Close( TRUE );
+            wxTheApp->DeletePendingObjects();
+        }
+        else
+        {
+            delete topWindow;
+            wxTheApp->SetTopWindow( (wxWindow*) NULL );
+        }
+    }
+
+    wxTheApp->OnExit();
+
+    /* flush the logged messages if any */
+    wxLog *log = wxLog::GetActiveTarget();
+    if (log != NULL && log->HasPendingMessages())
+        log->Flush();
+
+    wxApp::CleanUp();
+
+    return retValue;
+}