From: James Turner <jmt@Bishop.local>
Date: Wed, 19 Jun 2013 23:03:36 +0000 (+0100)
Subject: Simplify logic now SGPath::desktop works on Windows.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b7bf3ee62081977a0f5e6a6a6222a9538a72925f;p=flightgear.git

Simplify logic now SGPath::desktop works on Windows.
---

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index e72e24e11..632998d56 100644
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -367,35 +367,7 @@ static SGPath platformDefaultDataPath()
   return config;
 }
 
-SGPath platformDesktopPath()
-{  
-    /*
-  typedef BOOL (WINAPI*GetSpecialFolderPath)(HWND, LPWSTR, int, BOOL);
-  static GetSpecialFolderPath SHGetSpecialFolderPath = NULL;
-
-  // lazy open+resolve of shell32
-  if (!SHGetSpecialFolderPath) {
-    HINSTANCE shellDll = ::LoadLibrary("shell32");
-    SHGetSpecialFolderPath = (GetSpecialFolderPath) GetProcAddress(shellDll, "SHGetSpecialFolderPathA");
-  }
-  
-  if (!SHGetSpecialFolderPath)
-    return SGPath();
-  
-  char path[PATH_MAX];
-  if (SHGetSpecialFolderPath(0, path, CSIDL_DESKTOPDIRECTORY, false)) {
-    return SGPath(path);
-  }
-  
-  // failed, bad
-  return SGPath();
-    */
-    // TODO real implementation and move to SGPath
-    return SGPath(fgGetString("/sim/fg-current"));
-}
-#else
-
-#ifdef __APPLE__
+#elif __APPLE__
 #include <CoreServices/CoreServices.h>
 
 static SGPath platformDefaultDataPath()
@@ -422,11 +394,6 @@ static SGPath platformDefaultDataPath()
   return SGPath::home() / ".fgfs";
 }
 #endif
-SGPath platformDesktopPath()
-{
-  return SGPath::desktop();
-}
-#endif
 
 void fgInitHome()
 {