[this message is for the previous commit as well]

[wxWidgets.git] / src / univ / dialog.cpp

diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp
index 0f5bd5600093f5638e9a675c585fbad4b3609cee..cf1d19793b044fddfcdcb01debd13092609ae960 100644 (file)
--- a/src/univ/dialog.cpp
+++ b/src/univ/dialog.cpp
@@ -153,6 +153,18 @@ bool wxDialog::Show(bool show)
             EndModal(wxID_CANCEL);
     }
 
             EndModal(wxID_CANCEL);
     }
 

+    // Not sure how to put this in platform-specific
+    // code just yet. Nano-X has to force a size event,
+    // else there's no initial size.
+#if wxUSE_NANOX
+    if (show)
+    {
+        wxSizeEvent event(GetSize(), GetId());
+        event.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(event);
+    }
+#endif
+

     bool ret = wxDialogBase::Show(show);
 
     if ( show ) 
     bool ret = wxDialogBase::Show(show);
 
     if ( show ) 


@@ -190,14 +202,17 @@ int wxDialog::ShowModal()
         }
     }
 
         }
     }
 

-    wxBusyCursorSuspender cs; // temporarily suppress the busy cursor
-

     Show(TRUE);
 
     m_isShowingModal = TRUE;
 
     wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") );
 
     Show(TRUE);
 
     m_isShowingModal = TRUE;
 
     wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") );
 

+#if defined(__WXGTK__) || defined(__WXMGL__)
+    wxBusyCursorSuspender suspender;
+    // FIXME (FIXME_MGL) - make sure busy cursor disappears under MSW too
+#endif
+

     m_windowDisabler = new wxWindowDisabler(this);
     if ( !m_eventLoop )
         m_eventLoop = new wxEventLoop;
     m_windowDisabler = new wxWindowDisabler(this);
     if ( !m_eventLoop )
         m_eventLoop = new wxEventLoop;