Index: devel/codeblocks/files/patch-src_sdk_wxpropgrid_include_wx_propgrid_propgrid.h
===================================================================
--- devel/codeblocks/files/patch-src_sdk_wxpropgrid_include_wx_propgrid_propgrid.h	(nonexistent)
+++ devel/codeblocks/files/patch-src_sdk_wxpropgrid_include_wx_propgrid_propgrid.h	(working copy)
@@ -0,0 +1,11 @@
+--- src/sdk/wxpropgrid/include/wx/propgrid/propgrid.h.orig	2016-01-23 16:43:00 UTC
++++ src/sdk/wxpropgrid/include/wx/propgrid/propgrid.h
+@@ -700,7 +700,7 @@ protected:
+ #define wxPG_EMPTY_ARRAYSTRING  wxArrayString()
+ 
+ #if !defined(SWIG)
+-    #define wxPG_LABEL              (*((wxString*)NULL))  // Used to tell wxPGProperty to use label as name as well.
++    extern WXDLLIMPEXP_PG const wxString wxPG_LABEL; // Used to tell wxPGProperty to use label as name as well.
+     #define wxPG_NULL_BITMAP        wxNullBitmap
+     #define wxPG_COLOUR_BLACK       (*wxBLACK)
+ #else

Property changes on: devel/codeblocks/files/patch-src_sdk_wxpropgrid_include_wx_propgrid_propgrid.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: devel/codeblocks/files/patch-src_sdk_wxpropgrid_src_propgrid.cpp
===================================================================
--- devel/codeblocks/files/patch-src_sdk_wxpropgrid_src_propgrid.cpp	(nonexistent)
+++ devel/codeblocks/files/patch-src_sdk_wxpropgrid_src_propgrid.cpp	(working copy)
@@ -0,0 +1,28 @@
+--- src/sdk/wxpropgrid/src/propgrid.cpp.orig	2016-01-23 16:43:00 UTC
++++ src/sdk/wxpropgrid/src/propgrid.cpp
+@@ -333,6 +333,8 @@ const wxChar *wxPGTypeName_PyObject = wx
+ 
+ static const wxChar* gs_noCellText = wxT("@!");
+ 
++const wxString wxPG_LABEL;
++
+ // -----------------------------------------------------------------------
+ 
+ static void wxPGDrawFocusRect( wxDC& dc, const wxRect& rect )
+@@ -679,13 +681,13 @@ void wxPGProperty::Init()
+ 
+ void wxPGProperty::Init( const wxString& label, const wxString& name )
+ {
+-    if ( &label != ((wxString*)NULL) )
++    if ( label != wxPG_LABEL )
+         m_label = label;
+ 
+ #ifndef __WXPYTHON__
+-    if ( &name != ((wxString*)NULL) )
++    if ( name != wxPG_LABEL )
+ #else
+-    if ( (&name != ((wxString*)NULL)) && name != wxT("_LABEL_AS_NAME") )
++    if ( name != wxPG_LABEL && name != wxT("_LABEL_AS_NAME") )
+ #endif
+         DoSetName( name );
+     else

Property changes on: devel/codeblocks/files/patch-src_sdk_wxpropgrid_src_propgrid.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property