do not perform Gestalt tests under Mac OS X

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

diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index e238e4f740ea676d1f7c452416d3d25fcf64df9b..6d077eb60d705d047774462800a4c5e6c4184611 100644 (file)
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -21,6 +21,7 @@
 #include "wx/pen.h"
 #include "wx/brush.h"
 #include "wx/cursor.h"
 #include "wx/pen.h"
 #include "wx/brush.h"
 #include "wx/cursor.h"

+#include "wx/intl.h"

 #include "wx/icon.h"
 #include "wx/palette.h"
 #include "wx/dc.h"
 #include "wx/icon.h"
 #include "wx/palette.h"
 #include "wx/dc.h"


@@ -356,6 +357,7 @@ bool wxApp::Initialize()
 #endif
 
 
 #endif
 
 

+#ifndef __UNIX__

   // test the minimal configuration necessary
 
        long theSystem ;
   // test the minimal configuration necessary
 
        long theSystem ;


@@ -392,6 +394,7 @@ bool wxApp::Initialize()
                }
        }
        */
                }
        }
        */

+#endif

 
        // if we encountered any problems so far, give the error code and exit immediately
 
 
        // if we encountered any problems so far, give the error code and exit immediately
 

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index e238e4f740ea676d1f7c452416d3d25fcf64df9b..6d077eb60d705d047774462800a4c5e6c4184611 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -21,6 +21,7 @@
 #include "wx/pen.h"
 #include "wx/brush.h"
 #include "wx/cursor.h"
 #include "wx/pen.h"
 #include "wx/brush.h"
 #include "wx/cursor.h"

+#include "wx/intl.h"

 #include "wx/icon.h"
 #include "wx/palette.h"
 #include "wx/dc.h"
 #include "wx/icon.h"
 #include "wx/palette.h"
 #include "wx/dc.h"


@@ -356,6 +357,7 @@ bool wxApp::Initialize()
 #endif
 
 
 #endif
 
 

+#ifndef __UNIX__

   // test the minimal configuration necessary
 
        long theSystem ;
   // test the minimal configuration necessary
 
        long theSystem ;


@@ -392,6 +394,7 @@ bool wxApp::Initialize()
                }
        }
        */
                }
        }
        */

+#endif

 
        // if we encountered any problems so far, give the error code and exit immediately
 
 
        // if we encountered any problems so far, give the error code and exit immediately