Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wxStandardPaths compilation with gcc after recent changes

Browse Source 
Forward declare struct _GUID to allow referencing it in this header without
including the full <windows.h> or even <guiddef.h>.

This fixes compilation with gcc after the changes of
a0fb808087

Closes https://github.com/wxWidgets/wxWidgets/pull/108
This commit is contained in:
Vadim Zeitlin
2015-10-05 00:48:02 +02:00
parent 614cb5abf0
commit cb83c4e0de
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/msw/stdpaths.h
View File

@@ -11,6 +11,8 @@
#ifndef _WX_MSW_STDPATHS_H_ #ifndef _WX_MSW_STDPATHS_H_
#define _WX_MSW_STDPATHS_H_ #define _WX_MSW_STDPATHS_H_
struct _GUID;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxStandardPaths // wxStandardPaths
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -72,7 +74,7 @@ protected:
// get the path corresponding to the given standard CSIDL_XXX constant // get the path corresponding to the given standard CSIDL_XXX constant
static wxString DoGetDirectory(int csidl); static wxString DoGetDirectory(int csidl);
static wxString DoGetKnownFolder(const GUID& rfid); static wxString DoGetKnownFolder(const _GUID& rfid);
// return the directory of the application itself // return the directory of the application itself
wxString GetAppDir() const; wxString GetAppDir() const;