haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the property grid compatible with wx 3.3

This commit is contained in:
Ian McInerney 2023-04-12 18:52:50 +01:00
parent a6be0eef4a
commit 6c05801d9e
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/widgets/properties_panel.cpp
View File

@ -34,7 +34,10 @@
#include <wx/propgrid/advprops.h>
// This is provided by wx >3.3.0
#if !wxCHECK_VERSION( 3, 3, 0 )
extern APIIMPORT wxPGGlobalVarsClass* wxPGGlobalVars;
#endif
PROPERTIES_PANEL::PROPERTIES_PANEL( wxWindow* aParent, EDA_BASE_FRAME* aFrame ) :
wxPanel( aParent ),
@ -75,7 +78,13 @@ PROPERTIES_PANEL::PROPERTIES_PANEL( wxWindow* aParent, EDA_BASE_FRAME* aFrame )
wxPG_DEFAULT_STYLE );
m_grid->SetUnspecifiedValueAppearance( wxPGCell( wxT( "<...>" ) ) );
m_grid->SetExtraStyle( wxPG_EX_HELP_AS_TOOLTIPS );
#if wxCHECK_VERSION( 3, 3, 0 )
m_grid->SetValidationFailureBehavior( wxPGVFBFlags::MarkCell );
#else
m_grid->SetValidationFailureBehavior( wxPG_VFB_MARK_CELL );
#endif
m_grid->AddActionTrigger( wxPG_ACTION_NEXT_PROPERTY, WXK_RETURN );
m_grid->AddActionTrigger( wxPG_ACTION_NEXT_PROPERTY, WXK_NUMPAD_ENTER );
m_grid->AddActionTrigger( wxPG_ACTION_NEXT_PROPERTY, WXK_DOWN );

5
eeschema/dialogs/dialog_sim_model.cpp
View File

@ -1312,8 +1312,13 @@ void DIALOG_SIM_MODEL<T_symbol, T_field>::onParamGridSetFocus( wxFocusEvent& aEv
if( !selected )
selected = grid->wxPropertyGridInterface::GetFirst();
#if wxCHECK_VERSION( 3, 3, 0 )
if( selected )
grid->DoSelectProperty( selected, wxPGSelectPropertyFlags::Focus );
#else
if( selected )
grid->DoSelectProperty( selected, wxPG_SEL_FOCUS );
#endif
aEvent.Skip();
}