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

remove eeconfig.h error, and wxWidget version dependent trivial compile warning

This commit is contained in:
CHARRAS 2007-11-10 20:12:00 +00:00
parent abd7e400a0
commit 813d303c42
3 changed files with 309 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eeschema/eeconfig.h
View File

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

15
eeschema/netlist.h
View File

@ -13,7 +13,7 @@
#define ISBUS 1
#define CUSTOMPANEL_COUNTMAX 8 // Max number of netlist plugins
/* Id to select netlist type */
typedef enum {
NET_TYPE_UNINIT = 0,
@ -21,7 +21,12 @@ typedef enum {
NET_TYPE_ORCADPCB2,
NET_TYPE_CADSTAR,
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;
@ -77,6 +82,7 @@ public:
#if defined (DEBUG)
void Show( std::ostream& out, int ndx );
#endif
void SetNet( int aNetCode ) { m_NetCode = aNetCode; }
@ -108,7 +114,9 @@ eda_global int g_NbrObjNet;
eda_global ObjetNetListStruct* g_TabObjNet;
/* 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 );
/** Function ReturnUserNetlistTypeName
@ -118,7 +126,6 @@ void FreeTabNetList( ObjetNetListStruct* TabNetItems, int NbrNetItems );
* this function must be called first with "first_item" = true
* 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 );

2
pcbnew/zones.cpp
View File

@ -249,7 +249,7 @@ void WinEDA_ZoneFrame::CreateControls()
static const int GridList[4] = { 50, 100, 250, 500 };
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,
GridList[ii],