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 866a4faab8ae421fc6068145616b89cf00c4290e..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"


@@ -238,7 +239,11 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
         if (wxTopLevelWindows.GetCount() > 0)
         {
             wxWindow* win = (wxWindow*) wxTopLevelWindows.GetLast()->GetData();
         if (wxTopLevelWindows.GetCount() > 0)
         {
             wxWindow* win = (wxWindow*) wxTopLevelWindows.GetLast()->GetData();

+#ifdef __WXGTK20__
+            if (win->IsKindOf(CLASSINFO(wxMessageDialog)))
+#else

             if (win->IsKindOf(CLASSINFO(wxGenericMessageDialog)))
             if (win->IsKindOf(CLASSINFO(wxGenericMessageDialog)))

+#endif

                 win->OnInternalIdle();
         }
         return TRUE;
                 win->OnInternalIdle();
         }
         return TRUE;