remove eeconfig.h error, and wxWidget version dependent trivial compile warning (813d303c) · Commits · Elphel / kicad-source-mirror

eeschema/eeconfig.h

+293 −293

Original line number	Original line	Diff line number	Diff line
	@@ -39,8 +39,8 @@ static PARAM_CFG_INT NetFormatCfg
	wxT( "NetFmt" ), /* Ident String */		wxT( "NetFmt" ), /* Ident String */
	&g_NetFormat, /* Parameter address */		&g_NetFormat, /* Parameter address */
	NET_TYPE_PCBNEW, /* Default value */		NET_TYPE_PCBNEW, /* Default value */
	NET_TYPE_UNINIT, NET_TYPE_CUSTOM1 /* Min and Max values for the parameter */		NET_TYPE_PCBNEW, /* Min value for the parameter */
	/NET_TYPE_NOT_INIT, NET_TYPE_MAX-1/		NET_TYPE_CUSTOM_MAX /* Max value for the parameter */
	);		);

	static PARAM_CFG_INT UnitCfg		static PARAM_CFG_INT UnitCfg

eeschema/netlist.h

+21 −14

Original line number	Original line	Diff line number	Diff line
	@@ -13,7 +13,7 @@

	#define ISBUS 1		#define ISBUS 1

			#define CUSTOMPANEL_COUNTMAX 8 // Max number of netlist plugins
	/* Id to select netlist type */		/* Id to select netlist type */
	typedef enum {		typedef enum {
	NET_TYPE_UNINIT = 0,		NET_TYPE_UNINIT = 0,
	@@ -21,7 +21,12 @@ typedef enum {
	NET_TYPE_ORCADPCB2,		NET_TYPE_ORCADPCB2,
	NET_TYPE_CADSTAR,		NET_TYPE_CADSTAR,
	NET_TYPE_SPICE,		NET_TYPE_SPICE,
	NET_TYPE_CUSTOM1 // NET_TYPE_CUSTOM1 is the first id for user netlist format		NET_TYPE_CUSTOM1, /* NET_TYPE_CUSTOM1
			* is the first id for user netlist format
			* NET_TYPE_CUSTOM1+CUSTOMPANEL_COUNTMAX-1
			* is the last id for user netlist format
			*/
			NET_TYPE_CUSTOM_MAX = NET_TYPE_CUSTOM1+CUSTOMPANEL_COUNTMAX-1
	} TypeNetForm;		} TypeNetForm;


	@@ -77,6 +82,7 @@ public:

	#if defined (DEBUG)		#if defined (DEBUG)
	void Show( std::ostream& out, int ndx );		void Show( std::ostream& out, int ndx );

	#endif		#endif

	void SetNet( int aNetCode ) { m_NetCode = aNetCode; }		void SetNet( int aNetCode ) { m_NetCode = aNetCode; }
	@@ -108,7 +114,9 @@ eda_global int g_NbrObjNet;
	eda_global ObjetNetListStruct* g_TabObjNet;		eda_global ObjetNetListStruct* g_TabObjNet;

	/* Prototypes: */		/* Prototypes: */
	void WriteNetList( WinEDA_SchematicFrame* frame, const wxString& FileNameNL, bool use_netnames );		void WriteNetList( WinEDA_SchematicFrame* frame,
			const wxString& FileNameNL,
			bool use_netnames );
	void FreeTabNetList( ObjetNetListStruct* TabNetItems, int NbrNetItems );		void FreeTabNetList( ObjetNetListStruct* TabNetItems, int NbrNetItems );

	/** Function ReturnUserNetlistTypeName		/** Function ReturnUserNetlistTypeName
	@@ -118,7 +126,6 @@ void FreeTabNetList( ObjetNetListStruct* TabNetItems, int NbrNetItems );
	* this function must be called first with "first_item" = true		* this function must be called first with "first_item" = true
	* and after with "first_item" = false to get all the other existing netlist names		* and after with "first_item" = false to get all the other existing netlist names
	*/		*/
	#define CUSTOMPANEL_COUNTMAX 8 // Max number of netlist plugins
	wxString ReturnUserNetlistTypeName( bool first_item );		wxString ReturnUserNetlistTypeName( bool first_item );

pcbnew/zones.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -249,7 +249,7 @@ void WinEDA_ZoneFrame::CreateControls()
	static const int GridList[4] = { 50, 100, 250, 500 };		static const int GridList[4] = { 50, 100, 250, 500 };
	int selection = 0;		int selection = 0;

	for( int ii = 0; ii < m_GridCtrl->GetCount(); ii++ )		for( unsigned ii = 0; ii < (unsigned)m_GridCtrl->GetCount(); ii++ )
	{		{
	wxString msg = ReturnStringFromValue( g_UnitMetric,		wxString msg = ReturnStringFromValue( g_UnitMetric,
	GridList[ii],		GridList[ii],

Admin message