blob: 7d385bd6a61bddc4b0f95da7f5687986e7d7c74f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
Description: Fixes for GTK3 compatibility
wxWidgets 3.0 built with GTK3 doesn't have wxColour::GetPixel(), see:
http://trac.wxwidgets.org/ticket/15141#comment:2
Author: Olly Betts <olly@survex.com>
Forwarded: no
Last-Update: 2018-04-01
--- a/XS/Colour.xs
+++ b/XS/Colour.xs
@@ -114,7 +114,7 @@
#endif
-#if !defined(__WXMAC__)
+#if !defined(__WXMAC__) && !defined (__WXGTK3__)
long
wxColour::GetPixel()
--- a/ext/propgrid/XS/PGProperty.xsp
+++ b/ext/propgrid/XS/PGProperty.xsp
@@ -1148,7 +1148,7 @@
bool SetPlValue( wxColour* col, int flags = wxPG_SETVAL_REFRESH_EDITOR )
%code{%
if( col->IsOk() ) {
- wxVariant value = wxVariant(*col);
+ wxVariant value = wxVariant(wxAny(*col));
THIS->SetValue(value, NULL, flags );
RETVAL = true;
} else {
|