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

hide pageFmts[] since it is no longer NULL terminated and not global

This commit is contained in:
Dick Hollenbeck 2013-04-18 13:54:03 -05:00
parent 1f3b3d681c
commit a20c89288f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/dialogs/dialog_page_settings.cpp
View File

@ -51,7 +51,7 @@
// the translated and the not translated version. // the translated and the not translated version.
// when displayed in dialog we should explicitely call wxGetTranslation() // when displayed in dialog we should explicitely call wxGetTranslation()
// to show the translated version. // to show the translated version.
const wxString pageFmts[] = static const wxString pageFmts[] =
{ {
_("A4 210x297mm"), _("A4 210x297mm"),
_("A3 297x420mm"), _("A3 297x420mm"),

7
pcbnew/class_pcb_text.cpp
View File

@ -111,17 +111,18 @@ void TEXTE_PCB::Draw( EDA_DRAW_PANEL* panel, wxDC* DC,
void TEXTE_PCB::GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList ) void TEXTE_PCB::GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList )
{ {
wxString msg; wxString msg;
BOARD* board;
BOARD_ITEM* parent = (BOARD_ITEM*) m_Parent;
#if defined(DEBUG)
BOARD_ITEM* parent = (BOARD_ITEM*) m_Parent;
wxASSERT( parent ); wxASSERT( parent );
BOARD* board;
if( parent->Type() == PCB_DIMENSION_T ) if( parent->Type() == PCB_DIMENSION_T )
board = (BOARD*) parent->GetParent(); board = (BOARD*) parent->GetParent();
else else
board = (BOARD*) parent; board = (BOARD*) parent;
wxASSERT( board ); wxASSERT( board );
#endif
if( m_Parent && m_Parent->Type() == PCB_DIMENSION_T ) if( m_Parent && m_Parent->Type() == PCB_DIMENSION_T )
aList.push_back( MSG_PANEL_ITEM( _( "Dimension" ), m_Text, DARKGREEN ) ); aList.push_back( MSG_PANEL_ITEM( _( "Dimension" ), m_Text, DARKGREEN ) );