position the popup on the correct screen (see #10462)

[wxWidgets.git] / src / common / utilscmn.cpp

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 0a16b57fa407eba40074aa7939d868b1d46c56ac..02befc3f4381b7239c687fcadc762e401d20984b 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -182,7 +182,7 @@ wxString wxNow()
     return wxEmptyString;
 #endif
 #else
     return wxEmptyString;
 #endif
 #else

-    time_t now = time((time_t *) NULL);
+    time_t now = time(NULL);

     char *date = ctime(&now);
     date[24] = '\0';
     return wxString::FromAscii(date);
     char *date = ctime(&now);
     date[24] = '\0';
     return wxString::FromAscii(date);


@@ -942,7 +942,7 @@ void wxQsort(void *const pbase, size_t total_elems,
 // implemented in a port-specific utils source file:
 bool wxDoLaunchDefaultBrowser(const wxString& url, const wxString& scheme, int flags);
 
 // implemented in a port-specific utils source file:
 bool wxDoLaunchDefaultBrowser(const wxString& url, const wxString& scheme, int flags);
 

-#elif defined(__UNIX__) || defined(__WXCOCOA__) || \
+#elif defined(__WXX11__) || defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXCOCOA__) || \

       (defined(__WXMAC__) && !defined(__WXOSX_IPHONE__))
 
 // implemented in a port-specific utils source file:
       (defined(__WXMAC__) && !defined(__WXOSX_IPHONE__))
 
 // implemented in a port-specific utils source file:


@@ -1037,9 +1037,13 @@ static bool DoLaunchDefaultBrowserHelper(const wxString& urlOrig, int flags)
 
         if ( uri.GetScheme() == "file" )
         {
 
         if ( uri.GetScheme() == "file" )
         {

+            // TODO: extract URLToFileName() to some always compiled in
+            //       function
+#if wxUSE_FILESYSTEM

             // ShellExecuteEx() doesn't like the "file" scheme when opening local files; 
             // remove it
             url = wxFileSystem::URLToFileName(url).GetFullPath();
             // ShellExecuteEx() doesn't like the "file" scheme when opening local files; 
             // remove it
             url = wxFileSystem::URLToFileName(url).GetFullPath();

+#endif // wxUSE_FILESYSTEM

         }
     }
 
         }
     }