From 63decd70e6ab1bf2fe95db3f426f6cdfc79be213 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Fri, 6 May 2016 17:15:30 +0200 Subject: [PATCH] Minor fixes: Fix a few shadowed local variables, and deprecated warnings is a few dialogs generated by wxFormbuilder (using a very recent wxFormbuilder version, after apr 25, 2016) --- common/confirm.cpp | 3 ++- common/dialogs/dialog_exit_base.cpp | 6 ++---- common/dialogs/dialog_exit_base.fbp | 8 +++++--- common/dialogs/dialog_exit_base.h | 3 +-- gerbview/draw_gerber_screen.cpp | 10 +++++----- gerbview/rs274x.cpp | 10 +++++----- include/geometry/rtree.h | 4 ++-- .../dialogs/pcb_calculator_frame_base.cpp | 18 +++++++++--------- .../dialogs/pcb_calculator_frame_base.fbp | 6 +++--- .../dialogs/pcb_calculator_frame_base.h | 4 ++-- pcbnew/dialogs/dialog_pad_properties_base.cpp | 6 +++--- pcbnew/dialogs/dialog_pad_properties_base.h | 2 +- pcbnew/layer_widget.cpp | 4 ++-- 13 files changed, 42 insertions(+), 42 deletions(-) diff --git a/common/confirm.cpp b/common/confirm.cpp index 4e0b4abc45..cc3c9b0a1e 100644 --- a/common/confirm.cpp +++ b/common/confirm.cpp @@ -51,7 +51,6 @@ public: private: void OnSaveAndExit( wxCommandEvent& event ) { EndModal( wxID_YES ); } - void OnCancel( wxCommandEvent& event ) { EndModal( wxID_CANCEL ); } void OnExitNoSave( wxCommandEvent& event ) { EndModal( wxID_NO ); } }; @@ -61,6 +60,8 @@ int DisplayExitDialog( wxWindow* parent, const wxString& aMessage ) DIALOG_EXIT dlg( parent, aMessage ); int ret = dlg.ShowModal(); + + // Returns wxID_YES, wxID_NO, or wxID_CANCEL return ret; } diff --git a/common/dialogs/dialog_exit_base.cpp b/common/dialogs/dialog_exit_base.cpp index 0e1d422130..e11f818368 100644 --- a/common/dialogs/dialog_exit_base.cpp +++ b/common/dialogs/dialog_exit_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) +// C++ code generated with wxFormBuilder (version May 6 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -33,7 +33,7 @@ DIALOG_EXIT_BASE::DIALOG_EXIT_BASE( wxWindow* parent, wxWindowID id, const wxStr m_TextInfo = new wxStaticText( this, wxID_ANY, _("Save the changes before closing?"), wxDefaultPosition, wxDefaultSize, 0 ); m_TextInfo->Wrap( -1 ); - m_TextInfo->SetFont( wxFont( 8, 74, 90, 92, false, wxT("MS Shell Dlg 2") ) ); + m_TextInfo->SetFont( wxFont( 8, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxT("MS Shell Dlg 2") ) ); bSizerMessages->Add( m_TextInfo, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); @@ -85,7 +85,6 @@ DIALOG_EXIT_BASE::DIALOG_EXIT_BASE( wxWindow* parent, wxWindowID id, const wxStr // Connect Events m_buttonSaveAndExit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXIT_BASE::OnSaveAndExit ), NULL, this ); m_buttonExitNoSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXIT_BASE::OnExitNoSave ), NULL, this ); - m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXIT_BASE::OnCancel ), NULL, this ); } DIALOG_EXIT_BASE::~DIALOG_EXIT_BASE() @@ -93,6 +92,5 @@ DIALOG_EXIT_BASE::~DIALOG_EXIT_BASE() // Disconnect Events m_buttonSaveAndExit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXIT_BASE::OnSaveAndExit ), NULL, this ); m_buttonExitNoSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXIT_BASE::OnExitNoSave ), NULL, this ); - m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXIT_BASE::OnCancel ), NULL, this ); } diff --git a/common/dialogs/dialog_exit_base.fbp b/common/dialogs/dialog_exit_base.fbp index a02b7552f7..9490854179 100644 --- a/common/dialogs/dialog_exit_base.fbp +++ b/common/dialogs/dialog_exit_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -20,8 +20,10 @@ . 1 + 1 1 1 + UI 0 0 @@ -124,7 +126,7 @@ - + Load From File; 1 0 @@ -718,7 +720,7 @@ - OnCancel + diff --git a/common/dialogs/dialog_exit_base.h b/common/dialogs/dialog_exit_base.h index 73304357b3..78609d7f1a 100644 --- a/common/dialogs/dialog_exit_base.h +++ b/common/dialogs/dialog_exit_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) +// C++ code generated with wxFormBuilder (version May 6 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -51,7 +51,6 @@ class DIALOG_EXIT_BASE : public DIALOG_SHIM // Virtual event handlers, overide them in your derived class virtual void OnSaveAndExit( wxCommandEvent& event ) { event.Skip(); } virtual void OnExitNoSave( wxCommandEvent& event ) { event.Skip(); } - virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); } public: diff --git a/gerbview/draw_gerber_screen.cpp b/gerbview/draw_gerber_screen.cpp index 2ae6f4acdb..ace9ef8cb4 100644 --- a/gerbview/draw_gerber_screen.cpp +++ b/gerbview/draw_gerber_screen.cpp @@ -247,8 +247,6 @@ void GBR_LAYOUT::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, GR_DRAWMODE aDrawMode, if( gerber == NULL ) // Graphic layer not yet used continue; - EDA_COLOR_T color = gerbFrame->GetLayerColor( layer ); - // Force black and white draw mode on request: if( aPrintBlackAndWhite ) gerbFrame->SetLayerColor( layer, gerbFrame->GetDrawBgColor() == BLACK ? WHITE : BLACK ); @@ -302,12 +300,12 @@ void GBR_LAYOUT::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, GR_DRAWMODE aDrawMode, if( gerber->m_ImageNegative ) { // Draw background negative (i.e. in graphic layer color) for negative images. - EDA_COLOR_T color = gerbFrame->GetLayerColor( layer ); + EDA_COLOR_T neg_color = gerbFrame->GetLayerColor( layer ); GRSetDrawMode( &layerDC, GR_COPY ); GRFilledRect( &drawBox, plotDC, drawBox.GetX(), drawBox.GetY(), drawBox.GetRight(), drawBox.GetBottom(), - 0, color, color ); + 0, neg_color, neg_color ); GRSetDrawMode( plotDC, GR_COPY ); doBlit = true; @@ -323,6 +321,8 @@ void GBR_LAYOUT::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, GR_DRAWMODE aDrawMode, if( aDrawMode == GR_OR && !gerber->HasNegativeItems() ) layerdrawMode = GR_OR; + EDA_COLOR_T item_color = gerbFrame->GetLayerColor( layer ); + // Now we can draw the current layer to the bitmap buffer // When needed, the previous bitmap is already copied to the screen buffer. for( GERBER_DRAW_ITEM* item = gerbFrame->GetItemsList(); item; item = item->Next() ) @@ -340,7 +340,7 @@ void GBR_LAYOUT::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, GR_DRAWMODE aDrawMode, } if( aPrintBlackAndWhite ) - gerbFrame->SetLayerColor( layer, color ); + gerbFrame->SetLayerColor( layer, item_color ); } if( doBlit && useBufferBitmap ) // Blit is used only if aDrawMode >= 0 diff --git a/gerbview/rs274x.cpp b/gerbview/rs274x.cpp index 6371404937..6abdcf9fd7 100644 --- a/gerbview/rs274x.cpp +++ b/gerbview/rs274x.cpp @@ -1003,9 +1003,9 @@ bool GERBER_IMAGE::ReadApertureMacro( char buff[GERBER_BUFZ], AM_PRIMITIVE prim( m_GerbMetric ); prim.primitive_id = (AM_PRIMITIVE_ID) primitive_type; - int i; + int ii; - for( i = 0; i < paramCount && *text && *text != '*'; ++i ) + for( ii = 0; ii < paramCount && *text && *text != '*'; ++ii ) { prim.params.push_back( AM_PARAM() ); @@ -1019,11 +1019,11 @@ bool GERBER_IMAGE::ReadApertureMacro( char buff[GERBER_BUFZ], param.ReadParam( text ); } - if( i < paramCount ) + if( ii < paramCount ) { // maybe some day we can throw an exception and track a line number msg.Printf( wxT( "RS274X: read macro descr type %d: read %d parameters, insufficient parameters\n" ), - prim.primitive_id, i ); + prim.primitive_id, ii ); ReportMessage( msg ); } @@ -1039,7 +1039,7 @@ bool GERBER_IMAGE::ReadApertureMacro( char buff[GERBER_BUFZ], paramCount = (int) prim.params[1].GetValue( 0 ) * 2 + 1; - for( int i = 0; i < paramCount && *text != '*'; ++i ) + for( int jj = 0; jj < paramCount && *text != '*'; ++jj ) { prim.params.push_back( AM_PARAM() ); diff --git a/include/geometry/rtree.h b/include/geometry/rtree.h index 35ccadb6e5..1710d5aea2 100644 --- a/include/geometry/rtree.h +++ b/include/geometry/rtree.h @@ -768,8 +768,8 @@ DATATYPE RTREE_QUAL::NearestNeighbor( const ELEMTYPE a_point[NUMDIMS], // free memory used for remaining NNNodes in nodeList for( iterator iter = nodeList.begin(); iter != nodeList.end(); ++iter ) { - NNNode* node = *iter; - free(node); + NNNode* nnode = *iter; + free(nnode); } *a_squareDistance = closestNode->minDist; diff --git a/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp b/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp index fc7d81fce6..c209540834 100644 --- a/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp +++ b/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jan 1 2016) +// C++ code generated with wxFormBuilder (version May 2 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -63,7 +63,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_RegulFormula = new wxStaticText( sbSizerRegFormula->GetStaticBox(), wxID_ANY, _("Vout = Vref * (R1 + R2) / R2"), wxDefaultPosition, wxDefaultSize, 0 ); m_RegulFormula->Wrap( -1 ); - m_RegulFormula->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_RegulFormula->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); sbSizerRegFormula->Add( m_RegulFormula, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); @@ -242,7 +242,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_panelRegulators->SetSizer( bSizerMainReg ); m_panelRegulators->Layout(); bSizerMainReg->Fit( m_panelRegulators ); - m_Notebook->AddPage( m_panelRegulators, _("Regulators"), false ); + m_Notebook->AddPage( m_panelRegulators, _("Regulators"), true ); m_panelTrackWidth = new wxPanel( m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizerTrackWidth; bSizerTrackWidth = new wxBoxSizer( wxHORIZONTAL ); @@ -261,7 +261,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_staticTextCurrent = new wxStaticText( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, _("Current"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextCurrent->Wrap( -1 ); - m_staticTextCurrent->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) ); + m_staticTextCurrent->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); fgSizerTWprms->Add( m_staticTextCurrent, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxALIGN_RIGHT, 5 ); @@ -335,7 +335,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_staticTextExtWidth = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("Trace width"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextExtWidth->Wrap( -1 ); - m_staticTextExtWidth->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) ); + m_staticTextExtWidth->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); fgSizerTW_Results->Add( m_staticTextExtWidth, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT|wxRIGHT, 5 ); @@ -433,7 +433,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_staticTextIntWidth = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("Trace width"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextIntWidth->Wrap( -1 ); - m_staticTextIntWidth->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) ); + m_staticTextIntWidth->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); fgSizerTW_Results1->Add( m_staticTextIntWidth, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); @@ -552,7 +552,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_staticTextElectricalSpacing = new wxStaticText( m_panelElectricalSpacing, wxID_ANY, _("Note: Values are minimal values (from IPC 2221)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextElectricalSpacing->Wrap( -1 ); - m_staticTextElectricalSpacing->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 93, 92, false, wxEmptyString ) ); + m_staticTextElectricalSpacing->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bElectricalSpacingSizerRight->Add( m_staticTextElectricalSpacing, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 ); @@ -1171,7 +1171,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_panelAttenuators->SetSizer( sbSizerAtt ); m_panelAttenuators->Layout(); sbSizerAtt->Fit( m_panelAttenuators ); - m_Notebook->AddPage( m_panelAttenuators, _("RF Attenuators"), true ); + m_Notebook->AddPage( m_panelAttenuators, _("RF Attenuators"), false ); m_panelColorCode = new wxPanel( m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizerPanelColorCode; bSizerPanelColorCode = new wxBoxSizer( wxHORIZONTAL ); @@ -1251,7 +1251,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_staticTextBrdClass = new wxStaticText( m_panelBoardClass, wxID_ANY, _("Note: Values are minimal values"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextBrdClass->Wrap( -1 ); - m_staticTextBrdClass->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 93, 92, false, wxEmptyString ) ); + m_staticTextBrdClass->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); brdclsSizerRight->Add( m_staticTextBrdClass, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); diff --git a/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp b/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp index 258bfdd361..3e708955ef 100644 --- a/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp +++ b/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp @@ -44,7 +44,7 @@ PCB_CALCULATOR_FRAME_BASE - 754,485 + 877,485 wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER KIWAY_PLAYER; kiway_player.h PCB Calculator @@ -270,7 +270,7 @@ Regulators - 0 + 1 1 1 @@ -15262,7 +15262,7 @@ RF Attenuators - 1 + 0 1 1 diff --git a/pcb_calculator/dialogs/pcb_calculator_frame_base.h b/pcb_calculator/dialogs/pcb_calculator_frame_base.h index 2fa282855e..572834dbd9 100644 --- a/pcb_calculator/dialogs/pcb_calculator_frame_base.h +++ b/pcb_calculator/dialogs/pcb_calculator_frame_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jan 1 2016) +// C++ code generated with wxFormBuilder (version May 2 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -304,7 +304,7 @@ class PCB_CALCULATOR_FRAME_BASE : public KIWAY_PLAYER public: - PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("PCB Calculator"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 754,485 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL, const wxString& name = wxT("pcb_calculator") ); + PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("PCB Calculator"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 877,485 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL, const wxString& name = wxT("pcb_calculator") ); ~PCB_CALCULATOR_FRAME_BASE(); diff --git a/pcbnew/dialogs/dialog_pad_properties_base.cpp b/pcbnew/dialogs/dialog_pad_properties_base.cpp index 7f66d7eeed..6eff023509 100644 --- a/pcbnew/dialogs/dialog_pad_properties_base.cpp +++ b/pcbnew/dialogs/dialog_pad_properties_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 9 2016) +// C++ code generated with wxFormBuilder (version May 6 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -539,7 +539,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_staticTextWarning = new wxStaticText( m_localSettingsPanel, wxID_ANY, _("Set fields to 0 to use parent or global values"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextWarning->Wrap( -1 ); - m_staticTextWarning->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_staticTextWarning->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizerClearance->Add( m_staticTextWarning, 0, wxALL, 5 ); @@ -574,7 +574,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_staticTextWarningPadFlipped = new wxStaticText( this, wxID_ANY, _("Warning:\nThis pad is flipped on board.\nBack and front layers will be swapped."), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextWarningPadFlipped->Wrap( -1 ); - m_staticTextWarningPadFlipped->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_staticTextWarningPadFlipped->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); m_MainSizer->Add( m_staticTextWarningPadFlipped, 0, wxALL, 5 ); diff --git a/pcbnew/dialogs/dialog_pad_properties_base.h b/pcbnew/dialogs/dialog_pad_properties_base.h index cb3962621f..22c2f8f086 100644 --- a/pcbnew/dialogs/dialog_pad_properties_base.h +++ b/pcbnew/dialogs/dialog_pad_properties_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 9 2016) +// C++ code generated with wxFormBuilder (version May 6 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/layer_widget.cpp b/pcbnew/layer_widget.cpp index b3a1cd846a..37bffa80bc 100644 --- a/pcbnew/layer_widget.cpp +++ b/pcbnew/layer_widget.cpp @@ -274,9 +274,9 @@ void LAYER_WIDGET::OnLeftDownLayers( wxMouseEvent& event ) } -void LAYER_WIDGET::OnMiddleDownLayerColor( wxMouseEvent& event ) +void LAYER_WIDGET::OnMiddleDownLayerColor( wxMouseEvent& aEvent ) { - wxBitmapButton* eventSource = (wxBitmapButton*) event.GetEventObject(); + wxBitmapButton* eventSource = (wxBitmapButton*) aEvent.GetEventObject(); wxString colorTxt = eventSource->GetName();