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

Fix wxGTK 1 build after gtk/gtk.h wrapper header addition

Browse Source 
Changes of c0b0562533 to common code broke
wxGTK1 build, as wx/gtk/private/wrapgtk.h is for wxGTK 2+ only.

Fix this by handling wxGTK 1 separately and including gtk/gtk.h directly
for it.

Hopefully this code will be removed, together with the rest of wxGTK1
support, in some not so distant future.
This commit is contained in:
Vadim Zeitlin
2018-07-09 00:00:27 +02:00
parent 42932d4670
commit 8ebcfebc5c
8 changed files with 116 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/private/addremovectrl.h
View File

@@ -145,8 +145,10 @@ protected:
#ifdef __WXOSX__
#include "wx/osx/private/addremovectrl.h"
#elif defined(__WXGTK__)
#elif defined(__WXGTK20__)
#include "wx/gtk/private/addremovectrl.h"
#elif defined(__WXGTK__)
#include "wx/gtk1/private/addremovectrl.h"
#else
#include "wx/generic/private/addremovectrl.h"
#endif