Merge branch 'SteamEngine' of github.com:daid/Cura into SteamEngine

4 files changed, 17 insertions, 7 deletions

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index e105056a77..714fc8ea91 100644
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -3,6 +3,8 @@ __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AG
 import wx
 import os
 import webbrowser
+import sys
+
 
 from Cura.gui import configBase
 from Cura.gui import expertConfig
@@ -31,6 +33,14 @@ class mainWindow(wx.Frame):
 		# allow dropping any file, restrict later
 		self.SetDropTarget(dropTarget.FileDropTarget(self.OnDropFiles))
 
+		# TODO: wxWidgets 2.9.4 has a bug when NSView does not register for dragged types when wx drop target is set. It was fixed in 2.9.5
+		if sys.platform.startswith('darwin'):
+			import Cocoa
+			import objc
+			nswindow = objc.objc_object(c_void_p=self.MacGetTopLevelWindowRef())
+			view = nswindow.contentView()
+			view.registerForDraggedTypes_([Cocoa.NSFilenamesPboardType])
+
 		self.normalModeOnlyItems = []
 
 		mruFile = os.path.join(profile.getBasePath(), 'mru_filelist.ini')
diff --git a/scripts/darwin/STLQuickLook.qlgenerator.dSYM/Contents/Resources/DWARF/STLQuickLook b/scripts/darwin/STLQuickLook.qlgenerator.dSYM/Contents/Resources/DWARF/STLQuickLook
index f2dec2f2ac..2d04cd685e 100644
--- a/scripts/darwin/STLQuickLook.qlgenerator.dSYM/Contents/Resources/DWARF/STLQuickLook
+++ b/scripts/darwin/STLQuickLook.qlgenerator.dSYM/Contents/Resources/DWARF/STLQuickLook
diff --git a/scripts/darwin/STLQuickLook.qlgenerator/Contents/Info.plist b/scripts/darwin/STLQuickLook.qlgenerator/Contents/Info.plist
index 44f52f4553..8e917c02d1 100644
--- a/scripts/darwin/STLQuickLook.qlgenerator/Contents/Info.plist
+++ b/scripts/darwin/STLQuickLook.qlgenerator/Contents/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>12C60</string>
+	<string>13B42</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleDocumentTypes</key>
@@ -48,19 +48,19 @@
 	<key>CFPlugInUnloadFunction</key>
 	<string></string>
 	<key>DTCompiler</key>
-	<string></string>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>4G2008a</string>
+	<string>5A3005</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>12C37</string>
+	<string>13A595</string>
 	<key>DTSDKName</key>
-	<string>macosx10.8</string>
+	<string>macosx10.9</string>
 	<key>DTXcode</key>
-	<string>0452</string>
+	<string>0502</string>
 	<key>DTXcodeBuild</key>
-	<string>4G2008a</string>
+	<string>5A3005</string>
 	<key>QLNeedsToBeRunInMainThread</key>
 	<false/>
 	<key>QLPreviewHeight</key>
diff --git a/scripts/darwin/STLQuickLook.qlgenerator/Contents/MacOS/STLQuickLook b/scripts/darwin/STLQuickLook.qlgenerator/Contents/MacOS/STLQuickLook
index 02dbebaece..a6981b545d 100755
--- a/scripts/darwin/STLQuickLook.qlgenerator/Contents/MacOS/STLQuickLook
+++ b/scripts/darwin/STLQuickLook.qlgenerator/Contents/MacOS/STLQuickLook