electron-rare/kicad-source-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compatibility with wxWidgets 3.3.1

Browse Source
This commit is contained in:
jean-pierre charras
2025-09-07 18:46:54 +02:00
parent 46c8a6ee95
commit 288c93198a
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/properties/pg_properties.cpp
+3 -1
View File
@@ -696,7 +696,9 @@ PGPROPERTY_COLOR4D::PGPROPERTY_COLOR4D( const wxString& aLabel, const wxString&
m_backgroundColor( aBackgroundColor )
{
SetEditor( PG_COLOR_EDITOR::EDITOR_NAME );
#if wxCHECK_VERSION( 3, 3, 0 )
#if wxCHECK_VERSION( 3, 3, 1 )
SetFlag( wxPGFlags::NoEditor );
#elif wxCHECK_VERSION( 3, 3, 0 )
SetFlag( wxPGPropertyFlags::NoEditor );
#else
SetFlag( wxPG_PROP_NOEDITOR );
include/properties/pg_properties.h
+3 -1
View File
@@ -214,7 +214,9 @@ public:
wxEnumProperty( wxPG_LABEL, wxPG_LABEL, *aChoices, 0 ),
m_colorFunc( []( int aDummy ) { return wxNullColour; } )
{
#if wxCHECK_VERSION( 3, 3, 0 )
#if wxCHECK_VERSION( 3, 3, 1 )
SetFlag( wxPGFlags::CustomImage );
#elif wxCHECK_VERSION( 3, 3, 0 )
SetFlag( wxPGPropertyFlags::CustomImage );
#else
SetFlag( wxPG_PROP_CUSTOMIMAGE );