made GetDataDir() return the directory where the program is installed under MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -83,7 +83,7 @@ data files.
|
|||||||
Example return values:
|
Example return values:
|
||||||
\begin{itemize}
|
\begin{itemize}
|
||||||
\item Unix: \texttt{\textit{prefix}/share/\textit{appname}}
|
\item Unix: \texttt{\textit{prefix}/share/\textit{appname}}
|
||||||
\item Windows: \texttt{C:$\backslash$Program Files$\backslash$\textit{appname}}
|
\item Windows: the directory where the executable file is located
|
||||||
\item Mac: \texttt{\textit{appname}.app/Contents/SharedSupport} bundle subdirectory
|
\item Mac: \texttt{\textit{appname}.app/Contents/SharedSupport} bundle subdirectory
|
||||||
\end{itemize}
|
\end{itemize}
|
||||||
|
|
||||||
|
@@ -246,7 +246,9 @@ wxString wxStandardPaths::GetUserConfigDir() const
|
|||||||
|
|
||||||
wxString wxStandardPaths::GetDataDir() const
|
wxString wxStandardPaths::GetDataDir() const
|
||||||
{
|
{
|
||||||
return AppendAppName(DoGetDirectory(CSIDL_PROGRAM_FILES));
|
// under Windows each program is usually installed in its own directory and
|
||||||
|
// so its datafiles are in the same directory as its main executable
|
||||||
|
return wxFileName(wxGetFullModuleName()).GetPath();
|
||||||
}
|
}
|
||||||
|
|
||||||
wxString wxStandardPaths::GetUserDataDir() const
|
wxString wxStandardPaths::GetUserDataDir() const
|
||||||
|
Reference in New Issue
Block a user