compilation warning fix

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

diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp
index 6a29dbf93d7a6395f273811a40fa8e78a35fa55b..6b42e73d02c72a13fdaf3bea6cd218871fa235f7 100644 (file)
--- a/src/univ/dialog.cpp
+++ b/src/univ/dialog.cpp
@@ -6,14 +6,32 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "univdialog.h"
+    #pragma implementation "univdialog.h"
+#endif
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/dialog.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"

 #endif
 
 #endif
 

-#include "wx/dialog.h"
-#include "wx/utils.h"

 #include "wx/evtloop.h"
 #include "wx/evtloop.h"

-#include "wx/app.h"

 
 //-----------------------------------------------------------------------------
 // wxDialog
 
 //-----------------------------------------------------------------------------
 // wxDialog


@@ -46,7 +64,7 @@ bool wxDialog::Create(wxWindow *parent,
                       const wxPoint &pos, const wxSize &size,
                       long style, const wxString &name)
 {
                       const wxPoint &pos, const wxSize &size,
                       long style, const wxString &name)
 {

-    SetExtraStyle(GetExtraStyle() | wxTLW_EX_DIALOG);
+    SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);

 
     // all dialogs should have tab traversal enabled
     style |= wxTAB_TRAVERSAL;
 
     // all dialogs should have tab traversal enabled
     style |= wxTAB_TRAVERSAL;


@@ -172,14 +190,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;