Up-ported wxBusyCursor fix and wxCombBov default dialog

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

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 6b0b5276dfd766eae63fba54db2805b872a8ee6a..704c36a9210a81e2a6c3c22f2907569b305d1e1f 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -13,6 +13,7 @@
 
 #ifdef __VMS
 #include <vms_jackets.h>
 
 #ifdef __VMS
 #include <vms_jackets.h>

+#undef ConnectionNumber

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


@@ -24,6 +25,9 @@
 #include "wx/font.h"
 #include "wx/settings.h"
 #include "wx/dialog.h"
 #include "wx/font.h"
 #include "wx/settings.h"
 #include "wx/dialog.h"

+#include "wx/msgdlg.h"
+#include "wx/file.h"
+#include "wx/filename.h"

 
 #if wxUSE_WX_RESOURCES
     #include "wx/resource.h"
 
 #if wxUSE_WX_RESOURCES
     #include "wx/resource.h"


@@ -42,11 +46,32 @@
 #endif
 
 #include <unistd.h>
 #endif
 
 #include <unistd.h>

-#ifdef __VMS
-# include <poll.h>
-#else
-# include <sys/poll.h>
-#endif
+
+#ifdef HAVE_POLL
+    #if defined(__VMS)
+        #include <poll.h>
+    #else
+        // bug in the OpenBSD headers: at least in 3.1 there is no extern "C"
+        // in neither poll.h nor sys/poll.h which results in link errors later
+        #ifdef __OPENBSD__
+            extern "C"
+            {
+        #endif
+
+        #include <sys/poll.h>
+
+        #ifdef __OPENBSD__
+            };
+        #endif
+    #endif // platform
+#else // !HAVE_POLL
+    // we implement poll() ourselves using select() which is supposed exist in
+    // all modern Unices
+    #include <sys/types.h>
+    #include <sys/time.h>
+    #include <unistd.h>
+#endif // HAVE_POLL/!HAVE_POLL
+

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


@@ -85,12 +110,14 @@ void wxExit()
 // wxYield
 //-----------------------------------------------------------------------------
 
 // wxYield
 //-----------------------------------------------------------------------------
 

+// not static because used by textctrl.cpp
+//
+// MT-FIXME
+bool wxIsInsideYield = FALSE;
+

 bool wxApp::Yield(bool onlyIfNeeded)
 {
 bool wxApp::Yield(bool onlyIfNeeded)
 {

-    // MT-FIXME
-    static bool s_inYield = FALSE;
-
-    if ( s_inYield )
+    if ( wxIsInsideYield )

     {
         if ( !onlyIfNeeded )
         {
     {
         if ( !onlyIfNeeded )
         {


@@ -108,7 +135,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
     }
 #endif // wxUSE_THREADS
 
     }
 #endif // wxUSE_THREADS
 

-    s_inYield = TRUE;
+    wxIsInsideYield = TRUE;

 
     if (!g_isIdle)
     {
 
     if (!g_isIdle)
     {


@@ -128,7 +155,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
     // It's necessary to call ProcessIdle() to update the frames sizes which
     // might have been changed (it also will update other things set from
 
     // 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 
+    // 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().
     // call ProcessIdle() only once since this is not meant for longish
     // background jobs (controlled by wxIdleEvent::RequestMore() and the
     // return value of Processidle().


@@ -137,7 +164,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
     // let the logs be flashed again
     wxLog::Resume();
 
     // let the logs be flashed again
     wxLog::Resume();
 

-    s_inYield = FALSE;
+    wxIsInsideYield = FALSE;

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -208,6 +235,17 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
     // from some safely-looking functions
     if ( wxTheApp->IsInAssert() )
     {
     // from some safely-looking functions
     if ( wxTheApp->IsInAssert() )
     {

+        // But repaint the assertion message if necessary
+        if (wxTopLevelWindows.GetCount() > 0)
+        {
+            wxWindow* win = (wxWindow*) wxTopLevelWindows.GetLast()->GetData();
+#ifdef __WXGTK20__
+            if (win->IsKindOf(CLASSINFO(wxMessageDialog)))
+#else
+            if (win->IsKindOf(CLASSINFO(wxGenericMessageDialog)))
+#endif
+                win->OnInternalIdle();
+        }

         return TRUE;
     }
 #endif // __WXDEBUG__
         return TRUE;
     }
 #endif // __WXDEBUG__


@@ -237,15 +275,82 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 
 #if wxUSE_THREADS
 
 
 #if wxUSE_THREADS
 

+#ifdef HAVE_POLL
+    #define wxPoll poll
+    #define wxPollFd pollfd
+#else // !HAVE_POLL
+
+typedef GPollFD wxPollFd;
+
+int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout)
+{
+    // convert timeout from ms to struct timeval (s/us)
+    timeval tv_timeout;
+    tv_timeout.tv_sec = timeout/1000;
+    tv_timeout.tv_usec = (timeout%1000)*1000;
+
+    // remember the highest fd used here
+    int fdMax = -1;
+
+    // and fill the sets for select()
+    fd_set readfds;
+    fd_set writefds;
+    fd_set exceptfds;
+    FD_ZERO(&readfds);
+    FD_ZERO(&writefds);
+    FD_ZERO(&exceptfds);
+
+    unsigned int i;
+    for ( i = 0; i < nfds; i++ )
+    {
+        wxASSERT_MSG( ufds[i].fd < FD_SETSIZE, _T("fd out of range") );
+
+        if ( ufds[i].events & G_IO_IN )
+            FD_SET(ufds[i].fd, &readfds);
+
+        if ( ufds[i].events & G_IO_PRI )
+            FD_SET(ufds[i].fd, &exceptfds);
+
+        if ( ufds[i].events & G_IO_OUT )
+            FD_SET(ufds[i].fd, &writefds);
+
+        if ( ufds[i].fd > fdMax )
+            fdMax = ufds[i].fd;
+    }
+
+    fdMax++;
+    int res = select(fdMax, &readfds, &writefds, &exceptfds, &tv_timeout);
+
+    // translate the results back
+    for ( i = 0; i < nfds; i++ )
+    {
+        ufds[i].revents = 0;
+
+        if ( FD_ISSET(ufds[i].fd, &readfds ) )
+            ufds[i].revents |= G_IO_IN;
+
+        if ( FD_ISSET(ufds[i].fd, &exceptfds ) )
+            ufds[i].revents |= G_IO_PRI;
+
+        if ( FD_ISSET(ufds[i].fd, &writefds ) )
+            ufds[i].revents |= G_IO_OUT;
+    }
+
+    return res;
+}
+
+#endif // HAVE_POLL/!HAVE_POLL
+

 static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
 {
 static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
 {

-    gint res;

     gdk_threads_enter();
 
     wxMutexGuiLeave();
     g_mainThreadLocked = TRUE;
 
     gdk_threads_enter();
 
     wxMutexGuiLeave();
     g_mainThreadLocked = TRUE;
 

-    res = poll( (struct pollfd*) ufds, nfds, timeout );
+    // we rely on the fact that glib GPollFD struct is really just pollfd but
+    // I wonder how wise is this in the long term (VZ)
+    gint res = wxPoll( (wxPollFd *) ufds, nfds, timeout );

 
     wxMutexGuiEnter();
     g_mainThreadLocked = FALSE;
 
     wxMutexGuiEnter();
     g_mainThreadLocked = FALSE;


@@ -315,7 +420,7 @@ wxApp::wxApp()
 #endif
 
     m_colorCube = (unsigned char*) NULL;
 #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;
 }
     // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp
     m_glVisualInfo = (void *) NULL;
 }


@@ -342,7 +447,7 @@ bool wxApp::OnInitGui()
         // seems gtk_widget_set_default_visual no longer exists?
         GdkVisual* vis = gtk_widget_get_default_visual();
 #else
         // seems gtk_widget_set_default_visual no longer exists?
         GdkVisual* vis = gtk_widget_get_default_visual();
 #else

-        GdkVisual* vis = gdkx_visual_get( 
+        GdkVisual* vis = gdkx_visual_get(

             ((XVisualInfo *) m_glVisualInfo) ->visualid );
         gtk_widget_set_default_visual( vis );
 #endif
             ((XVisualInfo *) m_glVisualInfo) ->visualid );
         gtk_widget_set_default_visual( vis );
 #endif


@@ -352,7 +457,7 @@ bool wxApp::OnInitGui()
 
         visual = vis;
     }
 
         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.
 
     // On some machines, the default visual is just 256 colours, so
     // we make sure we get the best. This can sometimes be wasteful.
 


@@ -430,19 +535,29 @@ bool wxApp::OnInitGui()
 GdkVisual *wxApp::GetGdkVisual()
 {
     GdkVisual *visual = NULL;
 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 );
     if (m_glVisualInfo)
         visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid );
     else
         visual = gdk_window_get_visual( wxGetRootWindow()->window );

-        
+

     wxASSERT( visual );
     wxASSERT( visual );

-    
+

     return visual;
 }
 
 bool wxApp::ProcessIdle()
 {
     return visual;
 }
 
 bool wxApp::ProcessIdle()
 {

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

     wxIdleEvent event;
     event.SetEventObject( this );
     ProcessEvent( event );
     wxIdleEvent event;
     event.SetEventObject( this );
     ProcessEvent( event );


@@ -486,12 +601,29 @@ bool wxApp::SendIdleEvents()
         wxWindow* win = node->GetData();
         if (SendIdleEvents(win))
             needMore = TRUE;
         wxWindow* win = node->GetData();
         if (SendIdleEvents(win))
             needMore = TRUE;

+

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

+bool wxApp::CallInternalIdle( wxWindow* win )
+{
+    win->OnInternalIdle();
+
+    wxWindowList::Node  *node = win->GetChildren().GetFirst();
+    while (node)
+    {
+        wxWindow    *win = node->GetData();
+
+        CallInternalIdle( win );
+        node = node->GetNext();
+    }
+
+    return TRUE;
+}
+

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


@@ -501,21 +633,20 @@ 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;
 

-    wxNode* node = win->GetChildren().First();
+    wxWindowList::Node  *node = win->GetChildren().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxWindow* win = (wxWindow*) node->Data();
+        wxWindow    *win = node->GetData();
+

         if (SendIdleEvents(win))
             needMore = TRUE;
         if (SendIdleEvents(win))
             needMore = TRUE;

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

     }
     }

-    return needMore ;
+
+    return needMore;

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


@@ -547,30 +678,24 @@ void wxApp::Dispatch()
 
 void wxApp::DeletePendingObjects()
 {
 
 void wxApp::DeletePendingObjects()
 {

-    wxNode *node = wxPendingDelete.First();
+    wxNode *node = wxPendingDelete.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxObject *obj = (wxObject *)node->Data();
+        wxObject *obj = (wxObject *)node->GetData();

 
         delete obj;
 
         if (wxPendingDelete.Find(obj))
             delete node;
 
 
         delete obj;
 
         if (wxPendingDelete.Find(obj))
             delete node;
 

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

     }
 }
 
 bool wxApp::Initialize()
 {
     }
 }
 
 bool wxApp::Initialize()
 {

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

     wxClassInfo::InitializeClasses();
 
     wxClassInfo::InitializeClasses();
 

-#if wxUSE_INTL
-    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
-#endif
-

     // 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
     // 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


@@ -589,7 +714,12 @@ bool wxApp::Initialize()
 #endif
 
     wxModule::RegisterModules();
 #endif
 
     wxModule::RegisterModules();

-    if (!wxModule::InitializeModules()) return FALSE;
+    if (!wxModule::InitializeModules())
+        return FALSE;
+
+#if wxUSE_INTL
+    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -612,9 +742,6 @@ void wxApp::CleanUp()
     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 
     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 

-    delete[] wxBuffer;
-    wxBuffer = NULL;
-

     wxClassInfo::CleanUpClasses();
 
 #if wxUSE_THREADS
     wxClassInfo::CleanUpClasses();
 
 #if wxUSE_THREADS


@@ -771,9 +898,11 @@ int wxEntry( int argc, char *argv[] )
     wxTheApp->argv = argv;
 #endif
 
     wxTheApp->argv = argv;
 #endif
 

-    wxString name(wxFileNameFromPath(argv[0]));
-    wxStripExtension( name );
-    wxTheApp->SetAppName( name );
+    if (wxTheApp->argc > 0)
+    {
+        wxFileName fname( wxTheApp->argv[0] );
+        wxTheApp->SetAppName( fname.GetName() );
+    }

 
     int retValue;
     retValue = wxEntryInitGui();
 
     int retValue;
     retValue = wxEntryInitGui();


@@ -788,33 +917,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();
         }


@@ -825,54 +945,13 @@ 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__
 
 #ifdef __WXDEBUG__
 

-void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
+void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)

 {
     m_isInAssert = TRUE;
 
 {
     m_isInAssert = TRUE;
 

-    wxAppBase::OnAssert(file, line, msg);
+    wxAppBase::OnAssert(file, line, cond, msg);

 
     m_isInAssert = FALSE;
 }
 
     m_isInAssert = FALSE;
 }