Merge trunk @ 5256

CMakeLists.txt

@@ -406,7 +406,7 @@ add_definitions( -DWX_COMPATIBILITY )
 # See line 41 of CMakeModules/FindwxWidgets.cmake
 set( wxWidgets_CONFIG_OPTIONS --static=no )
 
-find_package( wxWidgets 3.0.0 COMPONENTS gl aui adv html core net base xml REQUIRED )
+find_package( wxWidgets 3.0.0 COMPONENTS gl adv html core net base xml REQUIRED )
 
 # Include wxWidgets macros.
 include( ${wxWidgets_USE_FILE} )
@@ -435,8 +435,8 @@ if( APPLE AND USE_OSX_DEPS_BUILDER )
     # This should be built in all cases, if swig exec is not available
     # will be impossible also enable SCRIPTING being for PCBNEW required immediately
 
-    include( download_pcre )
-    include( download_swig )
+    #include( download_pcre )
+    #include( download_swig )
 
 
     #set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.so;.dylib;.dll")
@@ -462,6 +462,7 @@ if( APPLE AND USE_OSX_DEPS_BUILDER )
         message(STATUS "Scripting ENABLED")
         include( download_wxpython )
 
+        set( SWIG_ROOT        /opt/local )
         set( SWIG_EXECUTABLE  ${SWIG_ROOT}/bin/swig )
         set( SWIG_INCLUDE     ${SWIG_ROOT}/include )
         set( PYTHON_DEST ${LIBWXPYTHON_ROOT}/wxPython/lib/python2.6/site-packages )
@@ -476,7 +477,7 @@ if( APPLE AND USE_OSX_DEPS_BUILDER )
         set( PYTHON_DEST ${LIBWXPYTHON_ROOT}/wxPython/lib/python2.6/site-packages )
 
         add_dependencies( lib-dependencies libwxpython )
-        add_dependencies( lib-dependencies swig )
+        #add_dependencies( lib-dependencies swig )
     else()
         include( download_wxwidgets )
         add_dependencies( lib-dependencies libwx )

CMakeModules/download_boost.cmake

@@ -159,6 +159,10 @@ if( APPLE )
             message( "-- BOOST found 32/64 Address Model" )
 
             set( BOOST_ADDRESSMODEL "address-model=32_64" )
+        else()
+            message( "-- BOOST found 64 Address Model" )
+
+            set( BOOST_ADDRESSMODEL "address-model=64" )
         endif()
 
         if( (CMAKE_OSX_ARCHITECTURES MATCHES "x86_64" OR CMAKE_OSX_ARCHITECTURES MATCHES "386") AND

common/hotkeys_basic.cpp

@@ -770,7 +770,7 @@ void AddHotkeyConfigMenu( wxMenu* aMenu )
 
     // Append HotkeySubmenu to menu
     AddMenuItem( aMenu, HotkeySubmenu,
-                 ID_PREFERENCES_HOTKEY_SUBMENU, _( "&Hotkeys" ),
+                 wxID_ANY, _( "&Hotkeys" ),
                  _( "Hotkeys configuration and preferences" ),
                  KiBitmap( hotkeys_xpm ) );
 }

eeschema/dialogs/dialog_plot_schematic.cpp

@@ -176,21 +176,20 @@ void DIALOG_PLOT_SCHEMATIC::OnOutputDirectoryBrowseClicked( wxCommandEvent& even
 
     wxFileName      dirName = wxFileName::DirName( dirDialog.GetPath() );
 
-    wxMessageDialog dialog( this, _( "Use a relative path? " ),
-                            _( "Plot Output Directory" ),
+    fn = Prj().AbsolutePath( g_RootSheet->GetFileName() );
+    wxString defaultPath = fn.GetPathWithSep();
+    wxString msg;
+    msg.Printf( _( "Do you want to use a path relative to\n'%s'" ),
+                GetChars( defaultPath ) );
+
+    wxMessageDialog dialog( this, msg, _( "Plot Output Directory" ),
                             wxYES_NO | wxICON_QUESTION | wxYES_DEFAULT );
 
     // relative directory selected
     if( dialog.ShowModal() == wxID_YES )
     {
-
-        wxString plotFilePath = g_RootSheet->GetFileName();
-
-        plotFilePath = Prj().AbsolutePath(plotFilePath);
-        plotFilePath = wxPathOnly( plotFilePath );
-
-        if( !dirName.MakeRelativeTo( plotFilePath ) )
-            wxMessageBox( _( "Cannot make path relative (target volume different from board file volume)!" ),
+        if( !dirName.MakeRelativeTo( defaultPath ) )
+            wxMessageBox( _( "Cannot make path relative (target volume different from file volume)!" ),
                           _( "Plot Output Directory" ), wxOK | wxICON_ERROR );
     }
 

include/id.h

@@ -85,7 +85,6 @@ enum main_id
     ID_CONFIG_READ,
 
     ID_PREFERENCES_HOTKEY_START,
-    ID_PREFERENCES_HOTKEY_SUBMENU,
     ID_PREFERENCES_HOTKEY_EXPORT_CONFIG,
     ID_PREFERENCES_HOTKEY_IMPORT_CONFIG,
     ID_PREFERENCES_HOTKEY_SHOW_EDITOR,

kicad/CMakeLists.txt

@@ -105,6 +105,10 @@ if( APPLE )
 
         # do all the work
         include( BundleUtilities )
+
+        # If `BU_CHMOD_BUNDLE_ITEMS` is not set, `install_name_tool` will fail to re-write some loader paths due to lack of writable permissions if the build dependencies were installed by brew (or didn't have writable permissions)
+        set(BU_CHMOD_BUNDLE_ITEMS ON)
+
         fixup_bundle( ${OSX_BUNDLE_INSTALL_BIN_DIR}/kicad
             \"\${BUNDLE_FIX_LIBS}\"
             \"\"

kicad/Info.plist

@@ -33,6 +33,7 @@
     <key>LSEnvironment</key>
         <dict>
             <key>KIGITHUB</key>     <string>https://github.com/kicad</string>
+            <key>KISYSMOD</key>     <string>/Library/Application Support/KiCad/pretty</string>
         </dict>
 </dict>
 </plist>

patches/wxwidgets-3.0.0_macosx_scrolledwindow.patch

+=== modified file 'src/generic/scrlwing.cpp'
+--- src/generic/scrlwing.cpp	2013-12-16 05:42:30 -0800
++++ src/generic/scrlwing.cpp	2014-10-21 01:19:02 -0700
+@@ -214,9 +214,6 @@
+         return true;
+     }
+ 
+-    if ( processed && event.IsCommandEvent())
+-        return true;
+-
+     // For wxEVT_PAINT the user code can either handle this event as usual or
+     // override virtual OnDraw(), so if the event hasn't been handled we need
+     // to call this virtual function ourselves.
+@@ -235,6 +232,11 @@
+         return true;
+     }
+ 
++    // If the user code handled this event, it should prevent the default 
++    // handling from taking place, so don't do anything else in this case. 
++    if ( processed ) 
++        return true; 
++
+     if ( evType == wxEVT_CHILD_FOCUS )
+     {
+         m_scrollHelper->HandleOnChildFocus((wxChildFocusEvent &)event);
+=== modified file 'src/generic/vscroll.cpp'
+--- src/generic/vscroll.cpp	2013-12-16 05:42:30 -0800
++++ src/generic/vscroll.cpp	2014-10-21 01:19:09 -0700
+@@ -89,9 +89,6 @@
+         return true;
+     }
+ 
+-    if ( processed && event.IsCommandEvent())
+-        return true;
+-
+     // For wxEVT_PAINT the user code can either handle this event as usual or
+     // override virtual OnDraw(), so if the event hasn't been handled we need
+     // to call this virtual function ourselves.
+@@ -110,6 +107,11 @@
+         return true;
+     }
+ 
++    // If the user code handled this event, it should prevent the default 
++    // handling from taking place, so don't do anything else in this case. 
++    if ( processed ) 
++        return true; 
++
+     // reset the skipped flag (which might have been set to true in
+     // ProcessEvent() above) to be able to test it below
+     bool wasSkipped = event.GetSkipped();

patches/wxwidgets-3.0.2_macosx_yosemite.patch

+=== added file 'patches/wxwidgets-3.0.2_macosx_yosemite_webview_webkit.mm.patch'
+--- patches/wxwidgets-3.0.2_macosx_yosemite_webview_webkit.mm.patch	1970-01-01 00:00:00 +0000
++++ patches/wxwidgets-3.0.2_macosx_yosemite_webview_webkit.mm.patch	2014-10-29 18:17:55 +0000
+@@ -0,0 +1,11 @@
++--- src/osx/webview_webkit.mm.orig	2014-09-16 07:27:52.000000000 -0600
+++++ src/osx/webview_webkit.mm	2014-09-16 07:28:12.000000000 -0600
++@@ -28,7 +28,7 @@
++ #include "wx/hashmap.h"
++ #include "wx/filesys.h"
++
++-#include <WebKit/WebKit.h>
+++#include <WebKit/WebKitLegacy.h>
++ #include <WebKit/HIWebView.h>
++ #include <WebKit/CarbonUtils.h>
++

pcbnew/dialogs/dialog_plot.cpp

@@ -315,18 +315,19 @@ void DIALOG_PLOT::OnOutputDirectoryBrowseClicked( wxCommandEvent& event )
 
     wxFileName      dirName = wxFileName::DirName( dirDialog.GetPath() );
 
-    wxMessageDialog dialog( this, _( "Use a relative path? " ),
-                            _( "Plot Output Directory" ),
+    fn = Prj().AbsolutePath( m_parent->GetBoard()->GetFileName() );
+    wxString defaultPath = fn.GetPathWithSep();
+    wxString msg;
+    msg.Printf( _( "Do you want to use a path relative to\n'%s'" ),
+                   GetChars( defaultPath ) );
+
+    wxMessageDialog dialog( this, msg, _( "Plot Output Directory" ),
                             wxYES_NO | wxICON_QUESTION | wxYES_DEFAULT );
 
     if( dialog.ShowModal() == wxID_YES )
     {
-        wxString boardFilePath = Prj().AbsolutePath( m_parent->GetBoard()->GetFileName() );
-
-        boardFilePath = wxPathOnly( boardFilePath );
-
-        if( !dirName.MakeRelativeTo( boardFilePath ) )
-            wxMessageBox( _( "Cannot make path relative (target volume different from board file volume)!" ),
+        if( !dirName.MakeRelativeTo( defaultPath ) )
+            wxMessageBox( _( "Cannot make path relative (target volume different from file volume)!" ),
                           _( "Plot Output Directory" ), wxOK | wxICON_ERROR );
     }
 

scripting/kicad.i

@@ -115,6 +115,10 @@
 /* KiCad plugin handling */
 %include "kicadplugins.i"
 
+// map CPolyLine and classes used in CPolyLine:
+#include <../polygon/PolyLine.h>
+%include <../polygon/PolyLine.h>
+
 // ignore warning relative to operator = and operator ++:
 #pragma SWIG nowarn=362,383
 

scripts/kicad-install.sh

@@ -132,7 +132,6 @@ install_prerequisites()
         sudo yum groupinstall "Development Tools" || exit 1
 
         prerequisite_list="
-            install
             bzr
             bzrtools
             bzip2-libs
@@ -144,7 +143,7 @@ install_prerequisites()
             glew-devel
             grep
             openssl-devel
-            wxGTK-devel
+            wxGTK3-devel
         "
 
         for p in ${prerequisite_list}
@@ -152,6 +151,15 @@ install_prerequisites()
             sudo yum install $p || exit 1
         done
 
+        echo "Checking wxGTK version. Maybe you have to symlink /usr/bin/wx-config-3.0 to /usr/bin/wx-config"
+        V=`wx-config --version | cut -f 1 -d '.'` || echo "Error running wx-config."
+        if [ $V -lt 3 ]
+        then
+        	echo "Error: wx-config is reporting version prior to 3"
+        	exit
+        else
+        	echo "All ok"
+        fi
         # Only install the scripting prerequisites if required.
         if [ "$(expr match "$OPTS" '.*\(-DKICAD_SCRIPTING=ON\)')" == "-DKICAD_SCRIPTING=ON" ]; then
         #echo "KICAD_SCRIPTING=ON"