only modal dialogs ignore busy cursor, not all dialogs

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 3463629b49dd4ebc5fcf3a271c3dad03f2175470..480836f8f956fb45f304dc200d55fbe54e58b58b 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -531,7 +531,7 @@ long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             // we want to override the busy cursor for modal dialogs:
             // typically, wxBeginBusyCursor() is called and then a modal dialog
             // is shown, but the modal dialog shouldn't have hourglass cursor
             // we want to override the busy cursor for modal dialogs:
             // typically, wxBeginBusyCursor() is called and then a modal dialog
             // is shown, but the modal dialog shouldn't have hourglass cursor

-            if ( wxIsBusy() )
+            if ( IsModalShowing() && wxIsBusy() )

             {
                 // set our cursor for all windows (but see below)
                 wxCursor cursor = m_cursor;
             {
                 // set our cursor for all windows (but see below)
                 wxCursor cursor = m_cursor;