[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

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

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

-#ifdef __GNUG__
-#pragma implementation "univdialog.h"
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #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


@@ -33,7 +51,7 @@ void wxDialog::Init()
     m_returnCode = 0;
     m_windowDisabler = NULL;
     m_eventLoop = NULL;
     m_returnCode = 0;
     m_windowDisabler = NULL;
     m_eventLoop = NULL;

-    m_isShowingModal = FALSE;
+    m_isShowingModal = false;

 }
 
 wxDialog::~wxDialog()
 }
 
 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;


@@ -69,7 +87,7 @@ void wxDialog::OnCancel(wxCommandEvent &WXUNUSED(event))
     else
     {
         SetReturnCode(wxID_CANCEL);
     else
     {
         SetReturnCode(wxID_CANCEL);

-        Show(FALSE);
+        Show(false);

     }
 }
 
     }
 }
 


@@ -84,7 +102,7 @@ void wxDialog::OnOK(wxCommandEvent &WXUNUSED(event))
         else
         {
             SetReturnCode(wxID_OK);
         else
         {
             SetReturnCode(wxID_OK);

-            Show(FALSE);
+            Show(false);

         }
     }
 }
         }
     }
 }


@@ -148,11 +166,6 @@ bool wxDialog::IsModal() const
     return m_isShowingModal;
 }
 
     return m_isShowingModal;
 }
 

-void wxDialog::SetModal(bool WXUNUSED(flag))
-{
-    wxFAIL_MSG( wxT("wxDialog:SetModal obsolete now") );
-}
-

 int wxDialog::ShowModal()
 {
     if ( IsModal() )
 int wxDialog::ShowModal()
 {
     if ( IsModal() )


@@ -172,14 +185,17 @@ int wxDialog::ShowModal()
         }
     }
 
         }
     }
 

-    wxBusyCursorSuspender cs; // temporarily suppress the busy cursor
+    Show(true);

 
 

-    Show(TRUE);
-
-    m_isShowingModal = TRUE;
+    m_isShowingModal = true;

 
     wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") );
 
 
     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;


@@ -201,9 +217,9 @@ void wxDialog::EndModal(int retCode)
         return;
     }
 
         return;
     }
 

-    m_isShowingModal = FALSE;
+    m_isShowingModal = false;

     
     m_eventLoop->Exit();
 
     
     m_eventLoop->Exit();
 

-    Show(FALSE);
+    Show(false);

 }
 }