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

Merge wxX11 build fixes

Browse Source 
Closes https://github.com/wxWidgets/wxWidgets/pull/231
This commit is contained in:
Vadim Zeitlin
2016-02-24 23:24:20 +01:00
parent aec2980e40 ffce5b09f8
commit d3a0798bc5
10 changed files with 251 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/generic/colrdlgg.h
View File

@@ -18,9 +18,12 @@
class WXDLLIMPEXP_FWD_CORE wxSlider;
#endif // wxUSE_SLIDER
// Preview with opacity is possible only
// if wxGCDC and wxStaticBitmap are available.
#define wxCLRDLGG_USE_PREVIEW_WITH_ALPHA (wxUSE_GRAPHICS_CONTEXT && wxUSE_STATBMP)
// Preview with opacity is possible only if wxGCDC and wxStaticBitmap are
// available and currently it only works in wxOSX and wxMSW as it uses wxBitmap
// UseAlpha() and HasAlpha() methods which only these ports provide.
#define wxCLRDLGG_USE_PREVIEW_WITH_ALPHA \
((wxUSE_GRAPHICS_CONTEXT && wxUSE_STATBMP) && \
(defined(__WXMSW__) || defined(__WXOSX__)))
#if wxCLRDLGG_USE_PREVIEW_WITH_ALPHA
class wxStaticBitmap;

2
include/wx/univ/scrolbar.h
View File

@@ -191,7 +191,7 @@ private:
// the object handling the arrows
wxScrollArrows m_arrows;
friend WXDLLIMPEXP_CORE class wxControlRenderer; // for geometry methods
friend class WXDLLIMPEXP_FWD_CORE wxControlRenderer; // for geometry methods
friend class wxStdScrollBarInputHandler; // for geometry methods
wxDECLARE_EVENT_TABLE();