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

Add missing __WXUNIVERSAL__ checks to fix wxUniv/MSW build

Browse Source 
Only define wxHAS_SYSTEM_THEMED_CONTROL when not using wxUniv, do define
wxHAS_GENERIC_TREECTRL when using it.

Closes #17399.
This commit is contained in:
Kolya Kosenko
2016-02-26 12:02:05 +01:00
committed by Vadim Zeitlin
parent 08f800ab16
commit 16468ac2ba
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/systhemectrl.h
View File

@@ -48,7 +48,7 @@ protected:
}; };
// Only __WXMSW__ has a non-trivial implementation currently. // Only __WXMSW__ has a non-trivial implementation currently.
#ifdef __WXMSW__ #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
#define wxHAS_SYSTEM_THEMED_CONTROL #define wxHAS_SYSTEM_THEMED_CONTROL
#endif #endif

2
include/wx/treectrl.h
View File

@@ -26,7 +26,7 @@
class WXDLLIMPEXP_FWD_CORE wxImageList; class WXDLLIMPEXP_FWD_CORE wxImageList;
#ifndef __WXMSW__ #if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
#define wxHAS_GENERIC_TREECTRL #define wxHAS_GENERIC_TREECTRL
#endif #endif