Code cleaning, minor fixes and minor coding style fixes. wxWidgets 2.9.4... (b810135e) · Commits · Elphel / kicad-source-mirror

3d-viewer/3d_draw.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -680,7 +680,7 @@ void MODULE::Draw3D( EDA_3D_CANVAS* glcanvas )
	if( g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_MODULE] )		if( g_Parm_3D_Visu.m_DrawFlags[g_Parm_3D_Visu.FL_MODULE] )
	{		{
	double zpos;		double zpos;
	if( m_Layer == LAYER_N_BACK )		if( IsFlipped() )
	zpos = g_Parm_3D_Visu.GetModulesZcoord3DIU( true );		zpos = g_Parm_3D_Visu.GetModulesZcoord3DIU( true );
	else		else
	zpos = g_Parm_3D_Visu.GetModulesZcoord3DIU( false );		zpos = g_Parm_3D_Visu.GetModulesZcoord3DIU( false );
	@@ -696,7 +696,7 @@ void MODULE::Draw3D( EDA_3D_CANVAS* glcanvas )
	glRotatef( (double) m_Orient / 10, 0.0, 0.0, 1.0 );		glRotatef( (double) m_Orient / 10, 0.0, 0.0, 1.0 );
	}		}

	if( m_Layer == LAYER_N_BACK )		if( IsFlipped() )
	{		{
	glRotatef( 180.0, 0.0, 1.0, 0.0 );		glRotatef( 180.0, 0.0, 1.0, 0.0 );
	glRotatef( 180.0, 0.0, 0.0, 1.0 );		glRotatef( 180.0, 0.0, 0.0, 1.0 );

3d-viewer/3d_frame.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -57,7 +57,7 @@ END_EVENT_TABLE()


	EDA_3D_FRAME::EDA_3D_FRAME( PCB_BASE_FRAME* parent, const wxString& title, long style ) :		EDA_3D_FRAME::EDA_3D_FRAME( PCB_BASE_FRAME* parent, const wxString& title, long style ) :
	wxFrame( parent, DISPLAY3D_FRAME, title, wxPoint( -1, -1 ), wxSize( -1, -1 ), style )		wxFrame( parent, DISPLAY3D_FRAME_TYPE, title, wxPoint( -1, -1 ), wxSize( -1, -1 ), style )
	{		{
	m_FrameName = wxT( "Frame3D" );		m_FrameName = wxT( "Frame3D" );
	m_Canvas = NULL;		m_Canvas = NULL;

common/basicframe.cpp

+37 −23

Original line number	Original line	Diff line number	Diff line
	@@ -56,12 +56,11 @@ static const wxChar* entryAutoSaveInterval = wxT( "AutoSaveInterval" );


	EDA_BASE_FRAME::EDA_BASE_FRAME( wxWindow* father,		EDA_BASE_FRAME::EDA_BASE_FRAME( wxWindow* father,
	int idtype,		ID_DRAWFRAME_TYPE idtype,
	const wxString& title,		const wxString& title,
	const wxPoint& pos,		const wxPoint& pos, const wxSize& size,
	const wxSize& size,
	long style ) :		long style ) :
	wxFrame( father, -1, title, pos, size, style )		wxFrame( father, wxID_ANY, title, pos, size, style )
	{		{
	wxSize minsize;		wxSize minsize;

	@@ -257,24 +256,6 @@ void EDA_BASE_FRAME::PrintMsg( const wxString& text )
	SetStatusText( text );		SetStatusText( text );
	}		}


	void EDA_BASE_FRAME::DisplayActivity( int PerCent, const wxString& Text )
	{
	wxString Line;

	Line = Text;

	PerCent = (PerCent < 0) ? 0 : PerCent;
	PerCent = (PerCent > 100) ? 100 : PerCent;
	PerCent /= 2; // Bargraph is 0 .. 50 points from 0% to 100%

	if( PerCent )
	Line.Pad( PerCent, '*' );

	SetStatusText( Line );
	}


	void EDA_BASE_FRAME::UpdateFileHistory( const wxString& FullFileName,		void EDA_BASE_FRAME::UpdateFileHistory( const wxString& FullFileName,
	wxFileHistory * aFileHistory )		wxFileHistory * aFileHistory )
	{		{
	@@ -663,3 +644,36 @@ edits you made?" ),
	wxRemoveFile( autoSaveFileName.GetFullPath() );		wxRemoveFile( autoSaveFileName.GetFullPath() );
	}		}
	}		}

			/**
			* Function SetModalMode
			* Disable or enable all other windows, to emulate a dialog behavior
			* Useful when the frame is used to show and selec items
			* (see FOOTPRINT_VIEWER_FRAME and LIB_VIEW_FRAME)
			*
			* @param aModal = true to disable all other opened windows (i.e.
			* this windows is in dialog mode
			* = false to enable other windows
			* This function is analog to MakeModal( aModal ), deprecated since wxWidgets 2.9.4
			*/
			void EDA_BASE_FRAME::SetModalMode( bool aModal )
			{
			// Disable all other windows
			#if wxCHECK_VERSION(2, 9, 4)
			if ( IsTopLevel() )
			{
			wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
			while (node)
			{
			wxWindow *win = node->GetData();
			if (win != this)
			win->Enable(!aModal);

			node = node->GetNext();
			}
			}
			#else
			// Deprecated since wxWidgets 2.9.4
			MakeModal( aModal );
			#endif
			}

common/drawframe.cpp

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -84,7 +84,8 @@ BEGIN_EVENT_TABLE( EDA_DRAW_FRAME, EDA_BASE_FRAME )
	END_EVENT_TABLE()		END_EVENT_TABLE()


	EDA_DRAW_FRAME::EDA_DRAW_FRAME( wxWindow* father, int idtype, const wxString& title,		EDA_DRAW_FRAME::EDA_DRAW_FRAME( wxWindow* father, ID_DRAWFRAME_TYPE idtype,
			const wxString& title,
	const wxPoint& pos, const wxSize& size, long style ) :		const wxPoint& pos, const wxSize& size, long style ) :
	EDA_BASE_FRAME( father, idtype, title, pos, size, style )		EDA_BASE_FRAME( father, idtype, title, pos, size, style )
	{		{

cvpcb/class_DisplayFootprintsFrame.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -76,7 +76,7 @@ DISPLAY_FOOTPRINTS_FRAME::DISPLAY_FOOTPRINTS_FRAME( CVPCB_MAINFRAME* parent,
	const wxString& title,		const wxString& title,
	const wxPoint& pos,		const wxPoint& pos,
	const wxSize& size, long style ) :		const wxSize& size, long style ) :
	PCB_BASE_FRAME( parent, CVPCB_DISPLAY_FRAME, title, pos, size, style )		PCB_BASE_FRAME( parent, CVPCB_DISPLAY_FRAME_TYPE, title, pos, size, style )
	{		{
	m_FrameName = wxT( "CmpFrame" );		m_FrameName = wxT( "CmpFrame" );
	m_showAxis = true; // true to draw axis.		m_showAxis = true; // true to draw axis.