corrected cw6 project files and other small problems

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index d6cc23bb5886f4e4bf5c3e2b1df49eeba9f6a090..71f441209d4db3d5cbe0d8e596fc5048cf2157ce 100644 (file)
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -360,8 +360,9 @@ bool wxApp::Initialize()
 #ifndef __UNIX__
   // test the minimal configuration necessary
 
 #ifndef __UNIX__
   // test the minimal configuration necessary
 

+       #if !TARGET_CARBON

        long theSystem ;
        long theSystem ;

-       long theMachine;
+       long theMachine; 

 
        if (Gestalt(gestaltMachineType, &theMachine) != noErr)
        {
 
        if (Gestalt(gestaltMachineType, &theMachine) != noErr)
        {


@@ -379,7 +380,6 @@ bool wxApp::Initialize()
        {
                error = kMacSTROldSystem  ;
        }
        {
                error = kMacSTROldSystem  ;
        }

-       #if !TARGET_CARBON

        else if ((long)GetApplLimit() - (long)ApplicationZone() < kMacMinHeap)
        {
                error = kMacSTRSmallSize;
        else if ((long)GetApplLimit() - (long)ApplicationZone() < kMacMinHeap)
        {
                error = kMacSTRSmallSize;

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index d6cc23bb5886f4e4bf5c3e2b1df49eeba9f6a090..71f441209d4db3d5cbe0d8e596fc5048cf2157ce 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -360,8 +360,9 @@ bool wxApp::Initialize()
 #ifndef __UNIX__
   // test the minimal configuration necessary
 
 #ifndef __UNIX__
   // test the minimal configuration necessary
 

+       #if !TARGET_CARBON

        long theSystem ;
        long theSystem ;

-       long theMachine;
+       long theMachine; 

 
        if (Gestalt(gestaltMachineType, &theMachine) != noErr)
        {
 
        if (Gestalt(gestaltMachineType, &theMachine) != noErr)
        {


@@ -379,7 +380,6 @@ bool wxApp::Initialize()
        {
                error = kMacSTROldSystem  ;
        }
        {
                error = kMacSTROldSystem  ;
        }

-       #if !TARGET_CARBON

        else if ((long)GetApplLimit() - (long)ApplicationZone() < kMacMinHeap)
        {
                error = kMacSTRSmallSize;
        else if ((long)GetApplLimit() - (long)ApplicationZone() < kMacMinHeap)
        {
                error = kMacSTRSmallSize;