realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 10:13:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix an outburst of error messages in UNIT_BINDER

Browse Source 
Fixes: lp:1804834
* https://bugs.launchpad.net/kicad/+bug/1804834
This commit is contained in:
Maciej Suminski 2018-11-23 15:58:38 +01:00
parent 149c4b55a6
commit 056114a15d
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/widgets/unit_binder.cpp
View File

@ -31,6 +31,8 @@
#include "widgets/unit_binder.h" #include "widgets/unit_binder.h"
wxDEFINE_EVENT( DELAY_FOCUS, wxCommandEvent );
UNIT_BINDER::UNIT_BINDER( EDA_DRAW_FRAME* aParent, UNIT_BINDER::UNIT_BINDER( EDA_DRAW_FRAME* aParent,
wxStaticText* aLabel, wxWindow* aValue, wxStaticText* aUnitLabel, wxStaticText* aLabel, wxWindow* aValue, wxStaticText* aUnitLabel,
bool aUseMils, int aMin, int aMax, bool allowEval ) : bool aUseMils, int aMin, int aMax, bool allowEval ) :
@ -58,6 +60,7 @@ UNIT_BINDER::UNIT_BINDER( EDA_DRAW_FRAME* aParent,
m_value->Connect( wxEVT_SET_FOCUS, wxFocusEventHandler( UNIT_BINDER::onSetFocus ), NULL, this ); m_value->Connect( wxEVT_SET_FOCUS, wxFocusEventHandler( UNIT_BINDER::onSetFocus ), NULL, this );
m_value->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( UNIT_BINDER::onKillFocus ), NULL, this ); m_value->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( UNIT_BINDER::onKillFocus ), NULL, this );
Connect( DELAY_FOCUS, wxCommandEventHandler( UNIT_BINDER::delayedFocusHandler ), NULL, this );
} }
@ -114,16 +117,18 @@ wxString valueDescriptionFromLabel( wxStaticText* aLabel )
} }
void UNIT_BINDER::delayedFocusHandler( wxIdleEvent& ) void UNIT_BINDER::delayedFocusHandler( wxCommandEvent& )
{ {
// Kill focus event handler must be temporarily disconnected, as displaying a message box
// will trigger the event handler and validation again, effectively creating an infinite loop
m_value->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( UNIT_BINDER::onKillFocus ), NULL, this );
if( !m_errorMessage.IsEmpty() ) if( !m_errorMessage.IsEmpty() )
DisplayError( m_value->GetParent(), m_errorMessage ); DisplayError( m_value->GetParent(), m_errorMessage );
m_errorMessage = wxEmptyString; m_errorMessage = wxEmptyString;
m_value->SetFocus(); m_value->SetFocus();
m_value->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( UNIT_BINDER::onKillFocus ), NULL, this );
m_value->Unbind( wxEVT_IDLE, &UNIT_BINDER::delayedFocusHandler, this );
} }
@ -144,7 +149,7 @@ bool UNIT_BINDER::Validate( bool setFocusOnError )
{ {
textEntry->SelectAll(); textEntry->SelectAll();
// Don't focus directly; we might be inside a KillFocus event handler // Don't focus directly; we might be inside a KillFocus event handler
m_value->Bind( wxEVT_IDLE, &UNIT_BINDER::delayedFocusHandler, this ); wxPostEvent( this, wxCommandEvent( DELAY_FOCUS ) );
} }
return false; return false;
@ -160,7 +165,7 @@ bool UNIT_BINDER::Validate( bool setFocusOnError )
{ {
textEntry->SelectAll(); textEntry->SelectAll();
// Don't focus directly; we might be inside a KillFocus event handler // Don't focus directly; we might be inside a KillFocus event handler
m_value->Bind( wxEVT_IDLE, &UNIT_BINDER::delayedFocusHandler, this ); wxPostEvent( this, wxCommandEvent( DELAY_FOCUS ) );
} }
return false; return false;

2
include/widgets/unit_binder.h
View File

@ -143,7 +143,7 @@ protected:
void onSetFocus( wxFocusEvent& aEvent ); void onSetFocus( wxFocusEvent& aEvent );
void onKillFocus( wxFocusEvent& aEvent ); void onKillFocus( wxFocusEvent& aEvent );
void delayedFocusHandler( wxIdleEvent& aEvent ); void delayedFocusHandler( wxCommandEvent& aEvent );
///> The bound widgets ///> The bound widgets
wxStaticText* m_label; wxStaticText* m_label;