wxBase compilation fix for Mac, with help from Ryan

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

diff --git a/configure b/configure
index 28d11f43fd9af6ae7a1adaaa8fb2d4e3bb9a22de..f8ccf0fd7f25d77fceb19c86666b79981cc0e3e3 100755 (executable)
--- a/configure
+++ b/configure
@@ -40562,8 +40562,6 @@ if test "$wxUSE_MAC" = 1 ; then
     else
         LDFLAGS="$LDFLAGS -lCarbonLib"
     fi
     else
         LDFLAGS="$LDFLAGS -lCarbonLib"
     fi

-elif test "$USE_DARWIN" = 1; then
-    LDFLAGS="$LDFLAGS -framework IOKit -framework CoreServices -framework System"

 fi
 if test "$wxUSE_COCOA" = 1 ; then
     LDFLAGS="$LDFLAGS -framework IOKit -framework Cocoa"
 fi
 if test "$wxUSE_COCOA" = 1 ; then
     LDFLAGS="$LDFLAGS -framework IOKit -framework Cocoa"


@@ -40571,6 +40569,9 @@ if test "$wxUSE_COCOA" = 1 ; then
         LDFLAGS="$LDFLAGS -framework QuickTime"
     fi
 fi
         LDFLAGS="$LDFLAGS -framework QuickTime"
     fi
 fi

+if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1 ; then
+    LDFLAGS="$LDFLAGS -framework IOKit -framework CoreServices -framework System -framework ApplicationServices"
+fi

 
 
 LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK $LIBS"
 
 
 LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK $LIBS"

diff --git a/configure.in b/configure.in
index b6ed6dbe9a7eec0942aceef61efebfcf2c1e546a..dcf20d7706dfb5f2e9b16cac362555b86a34362f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -6389,8 +6389,6 @@ if test "$wxUSE_MAC" = 1 ; then
     else
         LDFLAGS="$LDFLAGS -lCarbonLib"
     fi
     else
         LDFLAGS="$LDFLAGS -lCarbonLib"
     fi

-elif test "$USE_DARWIN" = 1; then
-    LDFLAGS="$LDFLAGS -framework IOKit -framework CoreServices -framework System"

 fi
 if test "$wxUSE_COCOA" = 1 ; then
     LDFLAGS="$LDFLAGS -framework IOKit -framework Cocoa"
 fi
 if test "$wxUSE_COCOA" = 1 ; then
     LDFLAGS="$LDFLAGS -framework IOKit -framework Cocoa"


@@ -6398,6 +6396,9 @@ if test "$wxUSE_COCOA" = 1 ; then
         LDFLAGS="$LDFLAGS -framework QuickTime"
     fi
 fi
         LDFLAGS="$LDFLAGS -framework QuickTime"
     fi
 fi

+if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1 ; then
+    LDFLAGS="$LDFLAGS -framework IOKit -framework CoreServices -framework System -framework ApplicationServices"
+fi

 
 dnl FIXME: should this be covered by the conditional above
 dnl given the -lm comment there?  Or should that comment (and
 
 dnl FIXME: should this be covered by the conditional above
 dnl given the -lm comment there?  Or should that comment (and

diff --git a/src/mac/corefoundation/hid.cpp b/src/mac/corefoundation/hid.cpp
index 4cb4aabd044f7fb287e4c49099ea8820ff616a43..a83519ac2caef33ebb9441241eb70c02cddd5609 100644 (file)
--- a/src/mac/corefoundation/hid.cpp
+++ b/src/mac/corefoundation/hid.cpp
@@ -573,13 +573,8 @@ bool wxGetKeyState (wxKeyCode key)
 //
 #include "wx/intl.h"
 
 //
 #include "wx/intl.h"
 

-#ifdef __WXCOCOA__

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

-#else
-#include "wx/mac/private.h"
-#include "LaunchServices.h"
-#endif

 
 #include "wx/uri.h"
 #include "wx/mac/corefoundation/cfstring.h"
 
 #include "wx/uri.h"
 #include "wx/mac/corefoundation/cfstring.h"