Remove my binary compatibility stuff from HEAD. Patch #1367014 used for reference.

[wxWidgets.git] / src / mac / carbon / dialog.cpp

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index 4f037becd78642a3420f56c3ec46212a22a9ae6f..61d903a38e19b1d5ddce2e0e52fa4bb49bee0742 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -57,9 +57,9 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
     style |= wxTAB_TRAVERSAL;
 
     if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style & ~(wxYES|wxOK|wxNO /*|wxCANCEL*/) , name) )
     style |= wxTAB_TRAVERSAL;
 
     if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style & ~(wxYES|wxOK|wxNO /*|wxCANCEL*/) , name) )

-        return FALSE;
+        return false;

 
 

-    return TRUE;
+    return true;

 }
 
 void wxDialog::SetModal(bool flag)
 }
 
 void wxDialog::SetModal(bool flag)


@@ -83,11 +83,11 @@ void wxDialog::SetModal(bool flag)
 
 wxDialog::~wxDialog()
 {
 
 wxDialog::~wxDialog()
 {

-    m_isBeingDeleted = TRUE;
-    Show(FALSE);
+    m_isBeingDeleted = true;
+    Show(false);

 }
 
 }
 

-// By default, pressing escape cancels the dialog , on mac command-stop does the same thing
+// By default, pressing escape cancels the dialog; on mac command-stop does the same thing

 void wxDialog::OnCharHook(wxKeyEvent& event)
 {
     if (( event.m_keyCode == WXK_ESCAPE ||
 void wxDialog::OnCharHook(wxKeyEvent& event)
 {
     if (( event.m_keyCode == WXK_ESCAPE ||


@@ -123,7 +123,7 @@ bool wxDialog::Show(bool show)
     if ( !wxDialogBase::Show(show) )
     {
         // nothing to do
     if ( !wxDialogBase::Show(show) )
     {
         // nothing to do

-        return FALSE;
+        return false;

     }
 
     if ( show )
     }
 
     if ( show )


@@ -140,13 +140,13 @@ bool wxDialog::Show(bool show)
         }
         else // end of modal dialog
         {
         }
         else // end of modal dialog
         {

-            // this will cause IsModalShowing() return FALSE and our local
+            // this will cause IsModalShowing() return false and our local

             // message loop will terminate
             wxModalDialogs.DeleteObject(this);
         }
     }
 
             // message loop will terminate
             wxModalDialogs.DeleteObject(this);
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 #if !TARGET_CARBON
 }
 
 #if !TARGET_CARBON


@@ -183,15 +183,13 @@ void wxDialog::DoShowModal()
 }
 
 
 }
 
 

-// Replacement for Show(TRUE) for modal dialogs - returns return code
+// Replacement for Show(true) for modal dialogs - returns return code

 int wxDialog::ShowModal()
 {
     if ( !m_isModalStyle )
 int wxDialog::ShowModal()
 {
     if ( !m_isModalStyle )

-    {
-        SetModal(TRUE);
-    }
+        SetModal(true);

 
 

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

     return GetReturnCode();
 }
 
     return GetReturnCode();
 }
 


@@ -200,7 +198,7 @@ int wxDialog::ShowModal()
 void wxDialog::EndModal(int retCode)
 {
     SetReturnCode(retCode);
 void wxDialog::EndModal(int retCode)
 {
     SetReturnCode(retCode);

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

     SetModal(false);
 }
 
     SetModal(false);
 }
 


@@ -208,15 +206,14 @@ void wxDialog::EndModal(int retCode)
 void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {
   if ( Validate() && TransferDataFromWindow() )
 void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {
   if ( Validate() && TransferDataFromWindow() )

-  {

       EndModal(wxID_OK);
       EndModal(wxID_OK);

-  }

 }
 
 void wxDialog::OnApply(wxCommandEvent& WXUNUSED(event))
 {
   if (Validate())
 }
 
 void wxDialog::OnApply(wxCommandEvent& WXUNUSED(event))
 {
   if (Validate())

-    TransferDataFromWindow();
+      TransferDataFromWindow();
+

   // TODO probably need to disable the Apply button until things change again
 }
 
   // TODO probably need to disable the Apply button until things change again
 }