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

Fix build problem with MSVS 2005 in wx/msw/uxtheme.h

Browse Source 
Avoid conflict with the incomplete MENUPARTS enum defined in the SDK
header included with this compiler.

Closes #18217.
This commit is contained in:
Vadim Zeitlin
2018-09-13 00:08:36 +02:00
parent 5b1aa5bb9c
commit 19caf034c3
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -136,6 +136,7 @@ wxMSW:
- Fix build in ANSI (non-Unicode) mode. - Fix build in ANSI (non-Unicode) mode.
- Improve wxNotebook themed background drawing (Arrigo Marchiori). - Improve wxNotebook themed background drawing (Arrigo Marchiori).
- Send wxEVT_WEBVIEW_NAVIGATING when redirecting (Josue Andrade Gomes). - Send wxEVT_WEBVIEW_NAVIGATING when redirecting (Josue Andrade Gomes).
- Fix build with MSVS 2005 broken in 3.1.1.
wxOSX: wxOSX:

5
include/wx/msw/uxtheme.h
View File

@@ -112,7 +112,10 @@ enum BORDERSTATES {
CBB_DISABLED = 4, CBB_DISABLED = 4,
}; };
enum MENUPARTS // The MENUPARTS enum is defined in MSVS 2005 SDK, even though it doesn't have
// vssym32.h, but it doesn't define the constants we use, so still define them,
// but make the enum unnamed for compatibility.
enum /* MENUPARTS -- FIXME-VC8: uncomment this when support for it is dropped */
{ {
MENU_MENUITEM_TMSCHEMA = 1, MENU_MENUITEM_TMSCHEMA = 1,
MENU_SEPARATOR_TMSCHEMA = 6, MENU_SEPARATOR_TMSCHEMA = 6,