tab traversal now works better (using uninitialized variable was a bad idea :-)

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

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 9cfd6f22531a2c43a37cbef946dbd0a42a588713..dbe4a42999a4d52ec8ca4939a57cd7fd05421ce1 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -18,6 +18,10 @@
 #include "wx/postscrp.h"
 #include "wx/intl.h"
 #include "wx/log.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/resource.h"

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


@@ -29,10 +33,11 @@
 // 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;

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


@@ -47,13 +52,13 @@ extern void wxFlushResources(void);
 void wxExit(void)
 {
   gtk_main_quit();
 void wxExit(void)
 {
   gtk_main_quit();

-};
+}

 
 bool wxYield(void)
 {
   while (gtk_events_pending() > 0) gtk_main_iteration();
   return TRUE;
 
 bool wxYield(void)
 {
   while (gtk_events_pending() > 0) gtk_main_iteration();
   return TRUE;

-};
+}

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


@@ -67,47 +72,48 @@ END_EVENT_TABLE()
 
 gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {
 
 gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {

-  if (wxTheApp) while (wxTheApp->ProcessIdle()) {};
+  if (wxTheApp) while (wxTheApp->ProcessIdle()) {}

   usleep( 10000 );
   return TRUE;
   usleep( 10000 );
   return TRUE;

-};
+}

 
 wxApp::wxApp()
 {
   m_idleTag = 0;
 
 wxApp::wxApp()
 {
   m_idleTag = 0;

-  m_topWindow = NULL;
+  m_topWindow = (wxWindow *) NULL;

   m_exitOnFrameDelete = TRUE;
   m_exitOnFrameDelete = TRUE;

-};
+  wxTheApp = this;
+}

 
 wxApp::~wxApp(void)
 {
   gtk_idle_remove( m_idleTag );
 
 wxApp::~wxApp(void)
 {
   gtk_idle_remove( m_idleTag );

-};
+}

 
 bool wxApp::OnInit(void)
 {
   return TRUE;
 
 bool wxApp::OnInit(void)
 {
   return TRUE;

-};
+}

 
 bool wxApp::OnInitGui(void)
 
 bool wxApp::OnInitGui(void)

-{ 
+{

   m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL );
   m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL );

-  return TRUE; 
-};
+  return TRUE;
+}

 
 

-int wxApp::OnRun(void) 
-{ 
-  return MainLoop(); 
-};
+int wxApp::OnRun(void)
+{
+  return MainLoop();
+}

 
 bool wxApp::ProcessIdle(void)
 {
   wxIdleEvent event;
   event.SetEventObject( this );
   ProcessEvent( event );
 
 bool wxApp::ProcessIdle(void)
 {
   wxIdleEvent event;
   event.SetEventObject( this );
   ProcessEvent( event );

-  
+

   return event.MoreRequested();
   return event.MoreRequested();

-};
+}

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


@@ -134,7 +140,7 @@ void wxApp::OnIdle( wxIdleEvent &event )
     event.RequestMore(TRUE);
 
   inOnIdle = FALSE;
     event.RequestMore(TRUE);
 
   inOnIdle = FALSE;

-};
+}

 
 bool wxApp::SendIdleEvents(void)
 {
 
 bool wxApp::SendIdleEvents(void)
 {


@@ -149,7 +155,7 @@ bool wxApp::SendIdleEvents(void)
                node = node->Next();
        }
     return needMore;
                node = node->Next();
        }
     return needMore;

-};
+}

 
 bool wxApp::SendIdleEvents( wxWindow* win )
 {
 
 bool wxApp::SendIdleEvents( wxWindow* win )
 {


@@ -172,37 +178,37 @@ bool wxApp::SendIdleEvents( wxWindow* win )
                node = node->Next();
        }
     return needMore ;
                node = node->Next();
        }
     return needMore ;

-};
+}

 
 int wxApp::OnExit(void)
 {
   return 0;
 
 int wxApp::OnExit(void)
 {
   return 0;

-};
+}

 
 int wxApp::MainLoop(void)
 {
   gtk_main();
   return 0;
 
 int wxApp::MainLoop(void)
 {
   gtk_main();
   return 0;

-};
+}

 
 void wxApp::ExitMainLoop(void)
 {
   gtk_main_quit();
 
 void wxApp::ExitMainLoop(void)
 {
   gtk_main_quit();

-};
+}

 
 bool wxApp::Initialized(void)
 {
   return m_initialized;
 
 bool wxApp::Initialized(void)
 {
   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)
 {


@@ -210,28 +216,28 @@ void wxApp::DeletePendingObjects(void)
   while (node)
   {
     wxObject *obj = (wxObject *)node->Data();
   while (node)
   {
     wxObject *obj = (wxObject *)node->Data();

-    
+

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

-  };
-};
+  }
+}

 
 wxWindow *wxApp::GetTopWindow(void)
 {
   if (m_topWindow) return m_topWindow;
   wxNode *node = wxTopLevelWindows.First();
 
 wxWindow *wxApp::GetTopWindow(void)
 {
   if (m_topWindow) return m_topWindow;
   wxNode *node = wxTopLevelWindows.First();

-  if (!node) return NULL;
+  if (!node) return (wxWindow *) NULL;

   return (wxWindow*)node->Data();
   return (wxWindow*)node->Data();

-};
+}

 
 void wxApp::SetTopWindow( wxWindow *win )
 {
   m_topWindow = win;
 
 void wxApp::SetTopWindow( wxWindow *win )
 {
   m_topWindow = win;

-};
+}

 
 void wxApp::CommonInit(void)
 {
 
 void wxApp::CommonInit(void)
 {


@@ -241,11 +247,20 @@ void wxApp::CommonInit(void)
   (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion);
 #endif
 */
   (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion);
 #endif
 */

+  wxSystemSettings::Init();
+  wxTheResourceCache = new wxResourceCache(wxKEY_STRING);
+
+  wxTheFontNameDirectory =  new wxFontNameDirectory;
+  wxTheFontNameDirectory->Initialize();

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

+
+  wxInitializeStockLists();

   wxInitializeStockObjects();
 
   wxInitializeStockObjects();
 

+  wxInitializeResourceSystem();
+

   // For PostScript printing
 #if USE_POSTSCRIPT
   wxInitializePrintSetupData();
   // For PostScript printing
 #if USE_POSTSCRIPT
   wxInitializePrintSetupData();


@@ -259,17 +274,27 @@ void wxApp::CommonInit(void)
 
   g_globalCursor = new wxCursor;
 */
 
   g_globalCursor = new wxCursor;
 */

-
-  wxInitializeStockObjects();
-};
+}

 
 void wxApp::CommonCleanUp(void)
 {
 
 void wxApp::CommonCleanUp(void)
 {

+  wxDELETE(wxTheColourDatabase);
+  wxDELETE(wxThePrintPaperDatabase);
+  wxDELETE(wxThePrintSetupData);
+  wxDELETE(wxTheFontNameDirectory);

   wxDeleteStockObjects();
   wxDeleteStockObjects();

-  
+

   wxFlushResources();
   wxFlushResources();

-};
-    
+
+  wxDELETE(wxTheResourceCache);
+
+  wxDeleteStockLists();
+
+  wxCleanUpResourceSystem();
+
+  wxSystemSettings::Done();
+}
+

 wxLog *wxApp::CreateLogTarget()
 {
   return new wxLogGui;
 wxLog *wxApp::CreateLogTarget()
 {
   return new wxLogGui;


@@ -284,47 +309,57 @@ int wxEntry( int argc, char *argv[] )
   wxBuffer = new char[BUFSIZ + 512];
 
   wxClassInfo::InitializeClasses();
   wxBuffer = new char[BUFSIZ + 512];
 
   wxClassInfo::InitializeClasses();

-  
+
+#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+
+#if !defined(_WINDLL)
+  streambuf* sBuf = new wxDebugStreamBuf;
+#else
+  streambuf* sBuf = NULL;
+#endif
+  ostream* oStr = new ostream(sBuf) ;
+  wxDebugContext::SetStream(oStr, sBuf);
+
+#endif
+

   if (!wxTheApp)
   {
     if (!wxApp::GetInitializerFunction())
     {
       printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
       return 0;
   if (!wxTheApp)
   {
     if (!wxApp::GetInitializerFunction())
     {
       printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
       return 0;

-    };
-    
+    }
+

     wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
     wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();

-    
+

     wxObject *test_app = app_ini();
     wxObject *test_app = app_ini();

-    
+

     wxTheApp = (wxApp*) test_app;
     wxTheApp = (wxApp*) test_app;

-    
-//    wxTheApp = (wxApp*)( app_ini() );
-  };
-  
-  if (!wxTheApp) 
+  }
+
+  if (!wxTheApp)

   {
     printf( "wxWindows error: wxTheApp == NULL\n" );
     return 0;
   {
     printf( "wxWindows error: wxTheApp == NULL\n" );
     return 0;

-  };
+  }

 
 

-//  printf( "Programmstart.\n" );
-  

   wxTheApp->argc = argc;
   wxTheApp->argv = argv;
   wxTheApp->argc = argc;
   wxTheApp->argv = argv;

+
+  gtk_set_locale();

   
   gtk_init( &argc, &argv );
 
 #ifdef USE_GDK_IMLIB
 
   gdk_imlib_init();
   
   gtk_init( &argc, &argv );
 
 #ifdef USE_GDK_IMLIB
 
   gdk_imlib_init();

-  
+

   gtk_widget_push_visual(gdk_imlib_get_visual());
   gtk_widget_push_visual(gdk_imlib_get_visual());

-  
+

   gtk_widget_push_colormap(gdk_imlib_get_colormap());
   gtk_widget_push_colormap(gdk_imlib_get_colormap());

-  
-#endif  
-    
+
+#endif
+

   wxApp::CommonInit();
 
   wxTheApp->OnInitGui();
   wxApp::CommonInit();
 
   wxTheApp->OnInitGui();


@@ -332,29 +367,45 @@ int wxEntry( int argc, char *argv[] )
   // Here frames insert themselves automatically
   // into wxTopLevelWindows by getting created
   // in OnInit().
   // Here frames insert themselves automatically
   // into wxTopLevelWindows by getting created
   // in OnInit().

-  
+

   if (!wxTheApp->OnInit()) return 0;
 
   wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0);
   if (!wxTheApp->OnInit()) return 0;
 
   wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0);

-  
+

   int retValue = 0;
   int retValue = 0;

-  
+

   if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
   if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();

-  
-  wxTheApp->DeletePendingObjects();  
-  
+
+  wxTheApp->DeletePendingObjects();
+

   wxTheApp->OnExit();
   wxTheApp->OnExit();

-  
+

   wxApp::CommonCleanUp();
   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);
+#endif
+

   return retValue;
   return retValue;

-};
+}

 
 //-----------------------------------------------------------------------------
 // main()
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // main()
 //-----------------------------------------------------------------------------
 

-#if defined(AIX) || defined(AIX4) || defined(____HPUX__)
+#if defined(AIX) || defined(AIX4) || defined(____HPUX__) || defined(NOMAIN)

 
  // main in IMPLEMENT_WX_MAIN in IMPLEMENT_APP in app.h
 
 
  // main in IMPLEMENT_WX_MAIN in IMPLEMENT_APP in app.h