File kicad-4.0.2-win64.patch of Package mingw32-kicad

Overview Repositories Revisions Requests Users Attributes Meta

File kicad-4.0.2-win64.patch of Package mingw32-kicad (Revision c76b43843160c5b3f722da85ff7fc77f)

Currently displaying revision c76b43843160c5b3f722da85ff7fc77f , Show latest

--- kicad-4.0.2/common/displlst.cpp	2016-02-13 22:14:42.000000000 +0100
+++ kicad-4.0.2/common/displlst.cpp	2016-06-07 12:40:34.003632043 +0200
@@ -161,7 +161,7 @@
 {
     long itemIndex = m_listBox->InsertItem( m_listBox->GetItemCount(), itemList[0] );
 
-    m_listBox->SetItemData( itemIndex, (long) &(itemList[0]) );
+    m_listBox->SetItemPtrData( itemIndex, (wxUIntPtr) &(itemList[0]) );
 
     // Adding the next columns content
     for( unsigned i = 1; i < itemList.size(); i++ )
@@ -184,7 +184,7 @@
             if( col == 0 )
             {
                 itemIndex = m_listBox->InsertItem( row+position, itemList[row].Item( col ) );
-                m_listBox->SetItemData( itemIndex, (long) &itemList[row].Item( col ) );
+                m_listBox->SetItemPtrData( itemIndex, (wxUIntPtr) &itemList[row].Item( col ) );
             }
             else
             {
--- kicad-4.0.2/pcbnew/eagle_plugin.cpp	2016-02-13 22:14:42.000000000 +0100
+++ kicad-4.0.2/pcbnew/eagle_plugin.cpp	2016-06-07 12:50:10.995024947 +0200
@@ -1059,10 +1059,10 @@
 
 
 /// Make a unique time stamp
-static inline unsigned long timeStamp( CPTREE& aTree )
+static time_t timeStamp( CPTREE& aTree )
 {
     // in this case from a unique tree memory location
-    return (unsigned long)(void*) &aTree;
+    return (time_t) (uintptr_t) &aTree;
 }
 
 
--- kicad-4.0.2/pcbnew/tools/pcb_editor_control.cpp	2016-02-13 22:14:42.000000000 +0100
+++ kicad-4.0.2/pcbnew/tools/pcb_editor_control.cpp	2016-06-07 13:15:33.665742244 +0200
@@ -725,7 +725,7 @@
 
 int PCB_EDITOR_CONTROL::HighlightNet( const TOOL_EVENT& aEvent )
 {
-    int netcode = aEvent.Parameter<long>();
+    int netcode = aEvent.Parameter<intptr_t>();
 
     if( netcode > 0 )
     {
--- kicad-4.0.2/pcbnew/tools/pcbnew_control.cpp	2016-02-13 22:14:42.000000000 +0100
+++ kicad-4.0.2/pcbnew/tools/pcbnew_control.cpp	2016-06-07 14:48:44.182733505 +0200
@@ -171,7 +171,7 @@
 
 int PCBNEW_CONTROL::ZoomPreset( const TOOL_EVENT& aEvent )
 {
-    unsigned int idx = aEvent.Parameter<long>();
+    unsigned int idx = aEvent.Parameter<intptr_t>();
     std::vector<double>& zoomList = m_frame->GetScreen()->m_ZoomList;
     KIGFX::VIEW* view = m_frame->GetGalCanvas()->GetView();
     KIGFX::GAL* gal = m_frame->GetGalCanvas()->GetGAL();
@@ -333,7 +333,7 @@
 // Layer control
 int PCBNEW_CONTROL::LayerSwitch( const TOOL_EVENT& aEvent )
 {
-    m_frame->SwitchLayer( NULL, (LAYER_ID) aEvent.Parameter<long>() );
+    m_frame->SwitchLayer( NULL, (LAYER_ID) aEvent.Parameter<intptr_t>() );
 
     return 0;
 }
@@ -446,7 +446,7 @@
 // Cursor control
 int PCBNEW_CONTROL::CursorControl( const TOOL_EVENT& aEvent )
 {
-    long type = aEvent.Parameter<long>();
+    long type = aEvent.Parameter<intptr_t>();
     bool fastMove = type & COMMON_ACTIONS::CURSOR_FAST_MOVE;
     type &= ~COMMON_ACTIONS::CURSOR_FAST_MOVE;
 
@@ -553,7 +553,7 @@
 
 int PCBNEW_CONTROL::PanControl( const TOOL_EVENT& aEvent )
 {
-    long type = aEvent.Parameter<long>();
+    long type = aEvent.Parameter<intptr_t>();
     KIGFX::VIEW* view = getView();
     GRID_HELPER gridHelper( m_frame );
     VECTOR2D center = view->GetCenter();
@@ -666,7 +666,7 @@
 
 int PCBNEW_CONTROL::GridPreset( const TOOL_EVENT& aEvent )
 {
-    long idx = aEvent.Parameter<long>();
+    long idx = aEvent.Parameter<intptr_t>();
 
     m_frame->SetPresetGrid( idx );
     updateGrid();

Places

File kicad-4.0.2-win64.patch of Package mingw32-kicad (Revision c76b43843160c5b3f722da85ff7fc77f)

Places