Commit 06d37c4b authored by charras's avatar charras

Fixed Crash when changing color under MacOSX. This could also affect all versions.

parent 6bedc7e0
...@@ -89,6 +89,7 @@ int g_GhostColor; ...@@ -89,6 +89,7 @@ int g_GhostColor;
* Please: if you change a value, remember these values are carefully chosen * Please: if you change a value, remember these values are carefully chosen
* to have good results in pcbnew, that uses the ORed value of basic colors * to have good results in pcbnew, that uses the ORed value of basic colors
* when displaying superimposed objects * when displaying superimposed objects
* The NULL value of the last item can be used as an end of list item
*/ */
StructColors ColorRefs[NBCOLOR] = StructColors ColorRefs[NBCOLOR] =
{ {
......
...@@ -98,7 +98,7 @@ WinEDA_SelColorFrame::WinEDA_SelColorFrame( wxWindow* parent, ...@@ -98,7 +98,7 @@ WinEDA_SelColorFrame::WinEDA_SelColorFrame( wxWindow* parent,
MainBoxSizer = new wxBoxSizer( wxHORIZONTAL ); MainBoxSizer = new wxBoxSizer( wxHORIZONTAL );
OuterBoxSizer->Add( MainBoxSizer, 1, wxGROW | wxLEFT | wxRIGHT | wxTOP, 5 ); OuterBoxSizer->Add( MainBoxSizer, 1, wxGROW | wxLEFT | wxRIGHT | wxTOP, 5 );
for( ii = 0; ColorRefs[ii].m_Name != NULL; ii++ ) for( ii = 0; ColorRefs[ii].m_Name != NULL && ii < NBCOLOR; ii++ )
{ {
// Provide a separate column for every eight buttons (and their // Provide a separate column for every eight buttons (and their
// associated text strings), so provide a FlexGrid Sizer with // associated text strings), so provide a FlexGrid Sizer with
......
...@@ -82,7 +82,7 @@ struct StructColors ...@@ -82,7 +82,7 @@ struct StructColors
int m_LightColor; int m_LightColor;
}; };
// list of existing Colors:
extern StructColors ColorRefs[NBCOLOR]; extern StructColors ColorRefs[NBCOLOR];
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment