Added deprecated property classes for future reference (maybe separate manual)

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 86a0258e1b51858cb529f629ab03edf4731d9da3..e3badff23723783c2ec63a11088ffb2a3bb57d2b 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -11,6 +11,10 @@
     #pragma implementation "app.h"
 #endif
 
     #pragma implementation "app.h"
 #endif
 

+#ifdef __VMS
+#include <vms_jackets.h>
+#endif
+

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


@@ -38,6 +42,13 @@
 #endif
 
 #include <unistd.h>
 #endif
 
 #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

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


@@ -50,25 +61,17 @@
 wxApp *wxTheApp = (wxApp *)  NULL;
 wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
 
 wxApp *wxTheApp = (wxApp *)  NULL;
 wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
 

-extern bool g_isIdle;
-

 bool   g_mainThreadLocked = FALSE;
 gint   g_pendingTag = 0;
 
 static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;
 
 //-----------------------------------------------------------------------------
 bool   g_mainThreadLocked = FALSE;
 gint   g_pendingTag = 0;
 
 static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;
 
 //-----------------------------------------------------------------------------

-// local functions
+// idle system

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

-extern "C"
-{
-    gint wxapp_idle_callback( gpointer WXUNUSED(data) );
-    gint wxapp_pending_callback( gpointer WXUNUSED(data) );
-}
+extern bool g_isIdle;

 
 

-void wxapp_install_thread_wakeup();
-void wxapp_uninstall_thread_wakeup();

 void wxapp_install_idle_handler();
 
 //-----------------------------------------------------------------------------
 void wxapp_install_idle_handler();
 
 //-----------------------------------------------------------------------------


@@ -125,12 +128,13 @@ bool wxApp::Yield(bool onlyIfNeeded)
     while (gtk_events_pending())
         gtk_main_iteration();
 
     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) */
-    while ( ProcessIdle() )
-    {
-    }
+    // 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();
 
     // let the logs be flashed again
     wxLog::Resume();


@@ -164,43 +168,25 @@ void wxWakeUpIdle()
 // local functions
 //-----------------------------------------------------------------------------
 
 // local functions
 //-----------------------------------------------------------------------------
 

-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 );
-}
-

 // the callback functions must be extern "C" to comply with GTK+ declarations
 extern "C"
 {
 
 // the callback functions must be extern "C" to comply with GTK+ declarations
 extern "C"
 {
 

-gint wxapp_pending_callback( gpointer WXUNUSED(data) )
+static gint wxapp_pending_callback( gpointer WXUNUSED(data) )

 {
     if (!wxTheApp) return TRUE;
 
 {
     if (!wxTheApp) return TRUE;
 

-    // when getting called from GDK's time-out handler
+    // When getting called from GDK's time-out handler

     // we are no longer within GDK's grab on the GUI
     // we are no longer within GDK's grab on the GUI

-    // thread so we must lock it here ourselves
+    // thread so we must lock it here ourselves.

     gdk_threads_enter();
 
     gdk_threads_enter();
 

-    // Sent idle event to all who request them
+    // Sent idle event to all who request them.

     wxTheApp->ProcessPendingEvents();
 
     g_pendingTag = 0;
 
     wxTheApp->ProcessPendingEvents();
 
     g_pendingTag = 0;
 

-    /* flush the logged messages if any */
+    // Flush the logged messages if any.

 #if wxUSE_LOG
     wxLog::FlushActive();
 #endif // wxUSE_LOG
 #if wxUSE_LOG
     wxLog::FlushActive();
 #endif // wxUSE_LOG


@@ -213,7 +199,7 @@ gint wxapp_pending_callback( gpointer WXUNUSED(data) )
     return FALSE;
 }
 
     return FALSE;
 }
 

-gint wxapp_idle_callback( gpointer WXUNUSED(data) )
+static gint wxapp_idle_callback( gpointer WXUNUSED(data) )

 {
     if (!wxTheApp)
         return TRUE;
 {
     if (!wxTheApp)
         return TRUE;


@@ -228,96 +214,77 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
     }
 #endif // __WXDEBUG__
 
     }
 #endif // __WXDEBUG__
 

-    // when getting called from GDK's time-out handler
+    // When getting called from GDK's time-out handler

     // we are no longer within GDK's grab on the GUI
     // we are no longer within GDK's grab on the GUI

-    // thread so we must lock it here ourselves
+    // thread so we must lock it here ourselves.

     gdk_threads_enter();
 
     gdk_threads_enter();
 

-    /* Indicate that we are now in idle mode - even so deeply
-       in idle mode that we don't get any idle events anymore.
-       this is like wxMSW where an idle event is sent only
-       once each time after the event queue has been completely
-       emptied */
+    // 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;
 
     g_isIdle = TRUE;
     wxTheApp->m_idleTag = 0;
 

-    // Sent idle event to all who request them as long as they do
-    while (wxTheApp->ProcessIdle())
+    // 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
         ;
 
     // 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)
+    // to be sent (single shot instead of continuous stream).

     return FALSE;
 }
 
 #if wxUSE_THREADS
 
     return FALSE;
 }
 
 #if wxUSE_THREADS
 

-gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
+static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )

 {
 {

-    // 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
+    gint res;

     gdk_threads_enter();
 
     gdk_threads_enter();
 

-    wxapp_uninstall_thread_wakeup();
-
-    // unblock other threads wishing to do some GUI things

     wxMutexGuiLeave();
     wxMutexGuiLeave();

-

     g_mainThreadLocked = TRUE;
 
     g_mainThreadLocked = TRUE;
 

-    // wake up other threads
-    wxUsleep( 1 );
+#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

 
 

-    // block other thread again

     wxMutexGuiEnter();
     wxMutexGuiEnter();

-

     g_mainThreadLocked = FALSE;
 
     g_mainThreadLocked = FALSE;
 

-    wxapp_install_thread_wakeup();
-
-    // release lock again

     gdk_threads_leave();
 
     gdk_threads_leave();
 

-    return TRUE;
+    return res;

 }
 
 #endif // wxUSE_THREADS
 
 } // extern "C"
 
 }
 
 #endif // wxUSE_THREADS
 
 } // extern "C"
 

-#if wxUSE_THREADS
-
-static int g_threadUninstallLevel = 0;
-
-void wxapp_install_thread_wakeup()
-{
-    g_threadUninstallLevel++;
-
-    if (g_threadUninstallLevel != 1) return;
-
-    if (wxTheApp->m_wakeUpTimerTag) return;
-
-    wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 50, wxapp_wakeup_timerout_callback, (gpointer) NULL );
-}
-
-void wxapp_uninstall_thread_wakeup()
+void wxapp_install_idle_handler()

 {
 {

-    g_threadUninstallLevel--;
+    wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );

 
 

-    if (g_threadUninstallLevel != 0) return;
+    g_isIdle = FALSE;

 
 

-    if (!wxTheApp->m_wakeUpTimerTag) return;
+    if (g_pendingTag == 0)
+        g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL );

 
 

-    gtk_timeout_remove( wxTheApp->m_wakeUpTimerTag );
-    wxTheApp->m_wakeUpTimerTag = 0;
+    // 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 );

 }
 
 }
 

-#endif // wxUSE_THREADS
-

 //-----------------------------------------------------------------------------
 // Access to the root window global
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // Access to the root window global
 //-----------------------------------------------------------------------------


@@ -353,8 +320,7 @@ wxApp::wxApp()
     wxapp_install_idle_handler();
 
 #if wxUSE_THREADS
     wxapp_install_idle_handler();
 
 #if wxUSE_THREADS

-    m_wakeUpTimerTag = 0;
-    wxapp_install_thread_wakeup();
+    g_main_set_poll_func( wxapp_poll_func );

 #endif
 
     m_colorCube = (unsigned char*) NULL;
 #endif
 
     m_colorCube = (unsigned char*) NULL;


@@ -367,10 +333,6 @@ wxApp::~wxApp()
 {
     if (m_idleTag) gtk_idle_remove( m_idleTag );
 
 {
     if (m_idleTag) gtk_idle_remove( m_idleTag );
 

-#if wxUSE_THREADS
-    wxapp_uninstall_thread_wakeup();
-#endif
-

     if (m_colorCube) free(m_colorCube);
 }
 
     if (m_colorCube) free(m_colorCube);
 }
 


@@ -501,20 +463,20 @@ void wxApp::OnIdle( wxIdleEvent &event )
 {
     static bool s_inOnIdle = FALSE;
 
 {
     static bool s_inOnIdle = FALSE;
 

-    /* Avoid recursion (via ProcessEvent default case) */
+    // Avoid recursion (via ProcessEvent default case)

     if (s_inOnIdle)
         return;
 
     s_inOnIdle = TRUE;
 
     if (s_inOnIdle)
         return;
 
     s_inOnIdle = TRUE;
 

-    /* Resend in the main thread events which have been prepared in other
-       threads */
+    // Resend in the main thread events which have been prepared in other
+    // threads

     ProcessPendingEvents();
 
     ProcessPendingEvents();
 

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

     DeletePendingObjects();
 
     DeletePendingObjects();
 

-    /* Send OnIdle events to all windows */
+    // Send OnIdle events to all windows

     bool needMore = SendIdleEvents();
 
     if (needMore)
     bool needMore = SendIdleEvents();
 
     if (needMore)


@@ -533,12 +495,37 @@ bool wxApp::SendIdleEvents()
         wxWindow* win = node->GetData();
         if (SendIdleEvents(win))
             needMore = TRUE;
         wxWindow* win = node->GetData();
         if (SendIdleEvents(win))
             needMore = TRUE;

+            

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

+    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;


@@ -548,8 +535,6 @@ bool wxApp::SendIdleEvents( wxWindow* win )
 
     win->GetEventHandler()->ProcessEvent(event);
 
 
     win->GetEventHandler()->ProcessEvent(event);
 

-    win->OnInternalIdle();
-

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


@@ -562,7 +547,8 @@ bool wxApp::SendIdleEvents( wxWindow* win )
 
         node = node->Next();
     }
 
         node = node->Next();
     }

-    return needMore ;
+    
+    return needMore;

 }
 
 int wxApp::MainLoop()
 }
 
 int wxApp::MainLoop()


@@ -610,8 +596,6 @@ void wxApp::DeletePendingObjects()
 
 bool wxApp::Initialize()
 {
 
 bool wxApp::Initialize()
 {

-    wxBuffer = new wxChar[BUFSIZ + 512];
-

     wxClassInfo::InitializeClasses();
 
 #if wxUSE_INTL
     wxClassInfo::InitializeClasses();
 
 #if wxUSE_INTL


@@ -649,9 +633,7 @@ void wxApp::CleanUp()
     wxCleanUpResourceSystem();
 #endif
 
     wxCleanUpResourceSystem();
 #endif
 

-    if (wxTheColourDatabase)
-        delete wxTheColourDatabase;
-
+    delete wxTheColourDatabase;

     wxTheColourDatabase = (wxColourDatabase*) NULL;
 
     wxDeleteStockObjects();
     wxTheColourDatabase = (wxColourDatabase*) NULL;
 
     wxDeleteStockObjects();


@@ -661,17 +643,13 @@ void wxApp::CleanUp()
     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 
     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 

-    // 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.
+    wxClassInfo::CleanUpClasses();
+

 #if wxUSE_THREADS
     delete wxPendingEvents;
     delete wxPendingEventsLocker;
 #endif
 
 #if wxUSE_THREADS
     delete wxPendingEvents;
     delete wxPendingEventsLocker;
 #endif
 

-    delete[] wxBuffer;
-
-    wxClassInfo::CleanUpClasses();
-

     // check for memory leaks
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
     // check for memory leaks
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     if (wxDebugContext::CountObjectsLeft(TRUE) > 0)


@@ -838,33 +816,24 @@ int wxEntry( int argc, char *argv[] )
 
     if ( retValue == 0 )
     {
 
     if ( retValue == 0 )
     {

-        /* delete pending toplevel windows (typically a single
-           dialog) so that, if there isn't any left, we don't
-           call OnRun() */
+        // Delete pending toplevel windows

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

-        wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0;
+        // When is the app not initialized ?
+        wxTheApp->m_initialized = TRUE;

 
         if (wxTheApp->Initialized())
         {
             wxTheApp->OnRun();
 
             wxWindow *topWindow = wxTheApp->GetTopWindow();
 
         if (wxTheApp->Initialized())
         {
             wxTheApp->OnRun();
 
             wxWindow *topWindow = wxTheApp->GetTopWindow();

+            
+            // Delete all pending windows if any
+            wxTheApp->DeletePendingObjects();
+    
+            // Reset top window 

             if (topWindow)
             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->SetTopWindow( (wxWindow*) NULL );

 
             retValue = wxTheApp->OnExit();
         }
 
             retValue = wxTheApp->OnExit();
         }


@@ -875,47 +844,6 @@ int wxEntry( int argc, char *argv[] )
     return retValue;
 }
 
     return retValue;
 }
 

-#ifndef __WXUNIVERSAL__
-
-// XPM hack: make the arrays const
-#define static static const
-
-#include "wx/gtk/info.xpm"
-#include "wx/gtk/error.xpm"
-#include "wx/gtk/question.xpm"
-#include "wx/gtk/warning.xpm"
-
-#undef static
-
-wxIcon wxApp::GetStdIcon(int which) const
-{
-    switch(which)
-    {
-        case wxICON_INFORMATION:
-            return wxIcon(info_xpm);
-
-        case wxICON_QUESTION:
-            return wxIcon(question_xpm);
-
-        case wxICON_EXCLAMATION:
-            return wxIcon(warning_xpm);
-
-        default:
-            wxFAIL_MSG(wxT("requested non existent standard icon"));
-            // still fall through
-
-        case wxICON_HAND:
-            return wxIcon(error_xpm);
-    }
-}
-#else
-wxIcon wxApp::GetStdIcon(int which) const
-{
-    return wxTheme::Get()->GetRenderer()->GetStdIcon(which);
-}
-#endif // !__WXUNIVERSAL__
-
-

 #ifdef __WXDEBUG__
 
 void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
 #ifdef __WXDEBUG__
 
 void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)