minor cleanup - reformatting

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

diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp
index edd348ad3c83d91d54be273e84fbb366890c02ab..32feb90cac49d5de9ae809f9e58efda5d5b7917d 100644 (file)
--- a/src/univ/dialog.cpp
+++ b/src/univ/dialog.cpp
@@ -3,7 +3,7 @@
 // Author:      Robert Roebling, Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
 // Author:      Robert Roebling, Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -14,10 +14,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -51,7 +47,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()


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

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

     }
 }
 
     }
 }
 


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

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

         }
     }
 }
         }
     }
 }


@@ -185,9 +181,9 @@ int wxDialog::ShowModal()
         }
     }
 
         }
     }
 

-    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?") );
 


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

-    m_isShowingModal = FALSE;
+    m_isShowingModal = false;

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

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

 }
 }