fix bad class_pcb.cpp file

pcbnew/class_pad.cpp

@@ -212,13 +212,7 @@ void D_PAD::Copy( D_PAD* source )
 /** Virtual function GetClearance
  * returns the clearance in internal units.  If \a aItem is not NULL then the
  * returned clearance is the greater of this object's clearance and
- * aItem's clearance.  If \a aItem is NULL, then this objects
-<<<<<<< TREE
- * clearance is returned.
-=======
- * clearance
- * is returned.
->>>>>>> MERGE-SOURCE
+ * aItem's clearance.  If \a aItem is NULL, then this object clearance is returned.
  * @param aItem is another BOARD_CONNECTED_ITEM or NULL
  * @return int - the clearance in internal units.
  */
@@ -234,17 +228,10 @@ int D_PAD::GetClearance( BOARD_CONNECTED_ITEM* aItem ) const
             clearance = ( (MODULE*) GetParent() )->m_LocalClearance;
     }
 
-<<<<<<< TREE
-    if( clearance == 0 )   // If the parent footprint clearance value = 0, use NETCLASS value
-        return BOARD_CONNECTED_ITEM::GetClearance( aItem );
-
-    // We have a specific clearance
-=======
     if( clearance == 0 )   // If the parent footprint clearance value = 0, use NETCLASS value
         return BOARD_CONNECTED_ITEM::GetClearance( aItem );
 
     // We have a specific clearance.
->>>>>>> MERGE-SOURCE
     // if aItem, return the biggest clearance
     if( aItem )
     {

pcbnew/menubar_pcbframe.cpp

@@ -336,7 +336,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
      */
     /* Zoom In */
     text = AddHotkeyName( _( "Zoom In" ), s_Pcbnew_Editor_Hokeys_Descr,
-                          HK_ZOOM_IN );
+                          HK_ZOOM_IN, false );
     item = new wxMenuItem( viewMenu, ID_ZOOM_IN, text,
                            HELP_ZOOM_IN, wxITEM_NORMAL );
     item->SetBitmap( zoom_in_xpm );
@@ -344,7 +344,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
 
     /* Zoom Out */
     text = AddHotkeyName( _( "Zoom Out" ), s_Pcbnew_Editor_Hokeys_Descr,
-                          HK_ZOOM_OUT );
+                          HK_ZOOM_OUT, false );
     item = new wxMenuItem( viewMenu, ID_ZOOM_OUT, text,
                            HELP_ZOOM_OUT, wxITEM_NORMAL );
 
@@ -376,7 +376,6 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
     viewMenu->AppendSeparator();
 
     /* 3D Display */
-    wxMenu* Display3DMenu = new wxMenu;
     item = new wxMenuItem( viewMenu, ID_MENU_PCB_SHOW_3D_FRAME,
                            _( "3D Display" ),
                            _( "Show board in 3D viewer" ) );
@@ -477,6 +476,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
     item = new wxMenuItem( placeMenu, ID_PCB_PLACE_OFFSET_COORD_BUTT,
                       _( "Drill and Place Offset" ),
                       _( "Place the offset adjust for drill and place files" ));
+    item->SetBitmap( pcb_offset_xpm );
     placeMenu->Append( item );
 
     /* Grid Origin */