Fix the rectangle size when offsetting

[wxWidgets.git] / src / mac / corefoundation / utilsexc_cf.cpp

diff --git a/src/mac/corefoundation/utilsexc_cf.cpp b/src/mac/corefoundation/utilsexc_cf.cpp
index 5eadfff5706dff5dc58c01d905d325417daeebc7..c5c4a4081137449eef56563e663f5c94c593bf57 100644 (file)
--- a/src/mac/corefoundation/utilsexc_cf.cpp
+++ b/src/mac/corefoundation/utilsexc_cf.cpp
@@ -21,6 +21,8 @@
 #include "wx/thread.h"
 #include "wx/process.h"
 
 #include "wx/thread.h"
 #include "wx/process.h"
 

+#include <sys/wait.h>
+

 // Use polling instead of Mach ports, which doesn't work on Intel
 // due to task_for_pid security issues.
 
 // Use polling instead of Mach ports, which doesn't work on Intel
 // due to task_for_pid security issues.
 


@@ -91,7 +93,7 @@ void* wxProcessTerminationThread::Entry()
             break;
         }
     }
             break;
         }
     }

-    
+

     return NULL;
 }
 
     return NULL;
 }
 


@@ -100,9 +102,9 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
     if (pid < 1)
         return -1;
 
     if (pid < 1)
         return -1;
 

-    wxProcessTerminationEventHandler* handler = new wxProcessTerminationEventHandler(proc_data);    
+    wxProcessTerminationEventHandler* handler = new wxProcessTerminationEventHandler(proc_data);

     wxProcessTerminationThread* thread = new wxProcessTerminationThread(proc_data, handler);
     wxProcessTerminationThread* thread = new wxProcessTerminationThread(proc_data, handler);

-    
+

     if (thread->Create() != wxTHREAD_NO_ERROR)
     {
         wxLogDebug(wxT("Could not create termination detection thread."));
     if (thread->Create() != wxTHREAD_NO_ERROR)
     {
         wxLogDebug(wxT("Could not create termination detection thread."));


@@ -112,14 +114,13 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
     }
 
     thread->Run();
     }
 
     thread->Run();

-    
+

     return 0;
 }
 
     return 0;
 }
 

-#else
+#else // !USE_POLLING

 
 #include <CoreFoundation/CFMachPort.h>
 
 #include <CoreFoundation/CFMachPort.h>

-#include <sys/wait.h>

 extern "C" {
 #include <mach/mach.h>
 }
 extern "C" {
 #include <mach/mach.h>
 }


@@ -132,13 +133,13 @@ void wxMAC_MachPortEndProcessDetect(CFMachPortRef port, void *data)
     int rc = waitpid(abs(proc_data->pid), &status, WNOHANG);
     if(!rc)
     {
     int rc = waitpid(abs(proc_data->pid), &status, WNOHANG);
     if(!rc)
     {

-       wxLogDebug(wxT("Mach port was invalidated, but process hasn't terminated!"));
-       return;
+        wxLogDebug(wxT("Mach port was invalidated, but process hasn't terminated!"));
+        return;

     }
     if((rc != -1) && WIFEXITED(status))
     }
     if((rc != -1) && WIFEXITED(status))

-       proc_data->exitcode = WEXITSTATUS(status);
+        proc_data->exitcode = WEXITSTATUS(status);

     else
     else

-       proc_data->exitcode = -1;
+        proc_data->exitcode = -1;

     wxHandleProcessTermination(proc_data);
 }
 
     wxHandleProcessTermination(proc_data);
 }
 


@@ -201,7 +202,7 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
         wxLogDebug(wxT("Couldn't create runloopsource"));
         return -1;
     }
         wxLogDebug(wxT("Couldn't create runloopsource"));
         return -1;
     }

-    
+

     CFRelease(CFMachPortForProcess);
 
     CFRunLoopAddSource(CFRunLoopGetCurrent(),runloopsource,kCFRunLoopDefaultMode);
     CFRelease(CFMachPortForProcess);
 
     CFRunLoopAddSource(CFRunLoopGetCurrent(),runloopsource,kCFRunLoopDefaultMode);


@@ -210,14 +211,17 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
     return 0;
 }
 
     return 0;
 }
 

-#endif
-  // USE_POLLING
+#endif // USE_POLLING/!USE_POLLING

 
 

-// NOTE: This doens't really belong here but this was a handy file to
+// NOTE: This doesn't really belong here but this was a handy file to

 // put it in because it's already compiled for wxCocoa and wxMac GUI lib.
 // put it in because it's already compiled for wxCocoa and wxMac GUI lib.

+#if wxUSE_GUI
+

 static wxStandardPathsCF gs_stdPaths;
 wxStandardPathsBase& wxGUIAppTraits::GetStandardPaths()
 {
     return gs_stdPaths;
 }
 
 static wxStandardPathsCF gs_stdPaths;
 wxStandardPathsBase& wxGUIAppTraits::GetStandardPaths()
 {
     return gs_stdPaths;
 }
 

+#endif // wxUSE_GUI
+