fix unwanted foreground frame change on Windows when creating BOM and netlists from scripts.

Very minor coverity warning fixes.
This commit is contained in:
jean-pierre charras 2015-08-28 16:15:45 +02:00
parent adddfd22a3
commit 156d5f50d6
4 changed files with 28 additions and 4 deletions

View File

@ -1669,9 +1669,18 @@ int VRML2_MODEL_PARSER::read_Normal()
{
// Debug
if( m_normalPerVertex == false )
wxLogTrace( traceVrmlV2Parser, m_debugSpacer + wxT( "read_Normal m_PerFaceNormalsNormalized.size: %zu" ), m_model->m_PerFaceNormalsNormalized.size() );
{
wxLogTrace( traceVrmlV2Parser,
m_debugSpacer + wxT( "read_Normal m_PerFaceNormalsNormalized.size: %zu" ),
m_model->m_PerFaceNormalsNormalized.size() );
}
else
wxLogTrace( traceVrmlV2Parser, m_debugSpacer + wxT( "read_Normal m_PerVertexNormalsNormalized.size: %zu" ), m_model->m_PerVertexNormalsNormalized.size() );
{
wxLogTrace( traceVrmlV2Parser,
m_debugSpacer + wxT( "read_Normal m_PerVertexNormalsNormalized.size: %zu" ),
m_model->m_PerVertexNormalsNormalized.size() );
}
debug_exit();
wxLogTrace( traceVrmlV2Parser, m_debugSpacer + wxT( "read_Normal exit" ) );
return 0;

View File

@ -26,6 +26,7 @@
#include <dialog_shim.h>
#include <kiway_player.h>
#include <wx/evtloop.h>
#include <pgm_base.h>
/// Toggle a window's "enable" status to disabled, then enabled on destruction.
@ -69,6 +70,18 @@ DIALOG_SHIM::DIALOG_SHIM( wxWindow* aParent, wxWindowID id, const wxString& titl
if( h )
SetKiway( this, &h->Kiway() );
#ifdef __WINDOWS__
// On Windows, the app top windows can be brought to the foreground
// (at least temporary) in certain circumstances,
// for instance when calling an external tool in Eeschema boom generation.
// So set the parent KIWAY_PLAYER kicad frame (if exists) to top window
// to avoid this annoying behavior
KIWAY_PLAYER* parent_kiwayplayer = dynamic_cast<KIWAY_PLAYER*>( aParent );
if( parent_kiwayplayer )
Pgm().App().SetTopWindow( parent_kiwayplayer );
#endif
#if DLGSHIM_USE_SETFOCUS
Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_SHIM::onInit ) );
#endif

View File

@ -51,6 +51,7 @@ bool LINK_TAGHANDLER::HandleTag(const wxHtmlTag& tag)
HTML_LINK_PARSER::HTML_LINK_PARSER( const wxString& aSrc, wxArrayString& aUrls )
: m_src( aSrc ), stringUrls( aUrls )
{
m_filter = NULL;
AddTagHandler( new LINK_TAGHANDLER(this) );
}

View File

@ -114,14 +114,15 @@ public:
m_dual( aIsDual ),
m_width( aWidth ),
m_baselineOffset( 0 )
{
{
// Do not leave unitialized members, and keep static analyser quiet:
m_type = MT_SINGLE;
m_amplitude = 0;
m_side = false;
m_baseIndex = 0;
m_currentTarget = NULL;
}
m_meanCornerRadius = 0;
}
/**
* Function SetType()