[ 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 d87d7ce8af2928d289c16ec2fe06635e2234d0b5..39a0695158bbdac8d90e6cc69333dd26724af100 100644 (file)
--- a/src/univ/dialog.cpp
+++ b/src/univ/dialog.cpp
@@ -46,29 +46,12 @@ END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
 
-wxDialog::wxDialog()
-{
-    Init();
-}
-
-wxDialog::wxDialog(wxWindow *parent,
-                   wxWindowID id,
-                   const wxString& title,
-                   const wxPoint& pos,
-                   const wxSize& size,
-                   long style,
-                   const wxString& name)
-{
-    Init();
-    Create(parent, id, title, pos, size, style, name);
-}
-
 void wxDialog::Init()
 {
     m_returnCode = 0;
     m_windowDisabler = NULL;
     m_eventLoop = NULL;
-    m_isShowingModal = FALSE;
+    m_isShowingModal = false;
 }
 
 wxDialog::~wxDialog()
@@ -104,7 +87,7 @@ void wxDialog::OnCancel(wxCommandEvent &WXUNUSED(event))
     else
     {
         SetReturnCode(wxID_CANCEL);
-        Show(FALSE);
+        Show(false);
     }
 }
 
@@ -119,7 +102,7 @@ void wxDialog::OnOK(wxCommandEvent &WXUNUSED(event))
         else
         {
             SetReturnCode(wxID_OK);
-            Show(FALSE);
+            Show(false);
         }
     }
 }
@@ -202,9 +185,9 @@ int wxDialog::ShowModal()
         }
     }
 
-    Show(TRUE);
+    Show(true);
 
-    m_isShowingModal = TRUE;
+    m_isShowingModal = true;
 
     wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") );
 
@@ -234,9 +217,9 @@ void wxDialog::EndModal(int retCode)
         return;
     }
 
-    m_isShowingModal = FALSE;
+    m_isShowingModal = false;
     
     m_eventLoop->Exit();
 
-    Show(FALSE);
+    Show(false);
 }