Win changes

.travis.yml

@@ -1,65 +1,18 @@
 language: cpp
-
-matrix:
-  include:
-    - dist: trusty
-      compiler: gcc
-    - os: osx
-      compiler: clang
-
 install:
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; 
-      then
-         sudo apt-get -qq update;
-         sudo apt-get install libwxgtk3.0-dev libwxgtk3.0-0 libgps-dev libglu1-mesa-dev libgtk2.0-dev libbz2-dev libtinyxml-dev; 
-         sudo apt-get install libportaudio2 portaudio19-dev libcurl4-openssl-dev libexpat1-dev libcairo2-dev librtlsdr-dev;
-         sudo apt-get install rpm;
-      fi
-
-#    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install wxmac --devel; fi
-# We do not use wxmac, everything comes in the prebuilt tarball downloaded bellow
-    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; 
-      then
-          brew install cairo libexif libarchive portaudio;
-          wget http://opencpn.navnux.org/build_deps/cairo_macos107.tar.xz;
-          tar xJf cairo_macos107.tar.xz -C /tmp;
-          wget http://opencpn.navnux.org/build_deps/wx_opencpn_macos107.tar.xz;
-          tar xJf wx_opencpn_macos107.tar.xz -C /tmp;
-          wget http://opencpn.navnux.org/build_deps/libarchive_macos107.tar.xz;
-          tar xJf libarchive_macos107.tar.xz -C /tmp;
-          export PATH="/usr/local/opt/gettext/bin:$PATH";
-          echo 'export PATH="/usr/local/opt/gettext/bin:$PATH"' >> ~/.bash_profile;
-          wget http://s.sudre.free.fr/Software/files/Packages.dmg;
-          hdiutil attach Packages.dmg;
-          sudo installer -pkg "/Volumes/Packages 1.2.4/Install Packages.pkg" -target "/";
-      fi
-# We install cairo and libarchive from Homebrew to pull in the dependencies, but use the custom Lion compatible build later.
-
+    - sudo apt-get -qq update
+    - sudo apt-get install libwxgtk3.0-dev libwxgtk3.0-0 libgps-dev libglu1-mesa-dev libgtk2.0-dev libbz2-dev libtinyxml-dev 
+    - sudo apt-get install libportaudio2 portaudio19-dev libcurl4-openssl-dev libexpat1-dev libcairo2-dev librtlsdr-dev
+    - sudo apt-get install rpm
 script:
   - if [[ "${COVERITY_SCAN_BRANCH}" == 1 ]];
     then
       echo "Don't build on coverty_scan branch.";
       exit 0;
     fi
   - mkdir build && cd build
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; 
-    then
-       cmake -DCMAKE_BUILD_TYPE=Release ../;
-       make -sj2 package;
-    fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]];
-    then
-        cmake -DOCPN_USE_LIBCPP=ON -DwxWidgets_CONFIG_EXECUTABLE=/tmp/wx_opencpn_macos107/bin/wx-config -DwxWidgets_CONFIG_OPTIONS="--prefix=/tmp/wx_opencpn_macos107" -DLibArchive_INCLUDE_DIR=/tmp/libarchive_macos107/include -DLibArchive_LIBRARY=/tmp/libarchive_macos107/lib/libarchive.dylib -DCAIRO_INCLUDE_DIR=/tmp/cairo_macos107/include -DCAIRO_LIBRARY=/tmp/cairo_macos107/lib/libcairo.dylib -DCMAKE_INSTALL_PREFIX=/tmp/opencpn ..;
-        make -s;
-        mkdir -p /tmp/opencpn/bin/OpenCPN.app/Contents/MacOS/; 
-        chmod 644 /usr/local/lib/lib*.dylib;
-        cp /usr/local/lib/libportaudio.2.dylib .;
-        cp /tmp/libarchive_macos107/lib/libarchive.16.dylib /tmp/opencpn/bin/OpenCPN.app/Contents/MacOS/; 
-        cp /tmp/cairo_macos107/lib/libcairo.2.dylib /tmp/opencpn/bin/OpenCPN.app/Contents/MacOS/; 
-        make install; 
-#       librtlsdr.0.dylib still missing
-        #make create-pkg;
-     fi
+  - cmake -DCMAKE_BUILD_TYPE=Release ../
+  - make -j2 package
 
 notifications:
     email: false

src/WeatherFaxUI.cpp

@@ -169,8 +169,10 @@ WeatherFaxBase::WeatherFaxBase( wxWindow* parent, wxWindowID id, const wxString&
 
 	// Connect Events
 	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( WeatherFaxBase::OnClose ) );
+#ifdef __OCPN__ANDROID__
 	m_lFaxes->Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( WeatherFaxBase::OnLeftDown ), NULL, this );
 	m_lFaxes->Connect( wxEVT_LEFT_UP, wxMouseEventHandler( WeatherFaxBase::OnLeftUp ), NULL, this );
+#endif
 	m_lFaxes->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( WeatherFaxBase::OnFaxes ), NULL, this );
 	m_lFaxes->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( WeatherFaxBase::OnEdit ), NULL, this );
 	this->Connect( m_menuItem61->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( WeatherFaxBase::OnInternet ) );
@@ -219,8 +221,10 @@ WeatherFaxBase::~WeatherFaxBase()
 {
 	// Disconnect Events
 	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( WeatherFaxBase::OnClose ) );
+#ifdef __OCPN__ANDROID__
 	m_lFaxes->Disconnect( wxEVT_LEFT_DOWN, wxMouseEventHandler( WeatherFaxBase::OnLeftDown ), NULL, this );
 	m_lFaxes->Disconnect( wxEVT_LEFT_UP, wxMouseEventHandler( WeatherFaxBase::OnLeftUp ), NULL, this );
+#endif
 	m_lFaxes->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( WeatherFaxBase::OnFaxes ), NULL, this );
 	m_lFaxes->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( WeatherFaxBase::OnEdit ), NULL, this );
 	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( WeatherFaxBase::OnInternet ) );

src/libaudiofile/config.h

@@ -1,17 +1,17 @@
-#if defined(__MSVC__)
+#if defined(__MSVC__)
   #include <BaseTsd.h>
-  typedef int ssize_t;
-  #define snprintf  _snprintf
-  #define HAVE_UNISTD_H 0
-
-  #pragma warning(disable: 4244)
-  #pragma warning(disable: 4800)
-
-#else
-  /* Define to 1 if you have the <unistd.h> header file. */
-  #define HAVE_UNISTD_H 1
-#endif
-
-#if (defined(__GNUC__) && defined(__STRICT_ANSI__)) || (defined(_MSC_VER) && !defined(__cplusplus))   /* Visual Studio */
-#  define inline __inline           /* Visual C is not C99, but supports some kind of inline */
-#endif
+  typedef int ssize_t;
+  #define snprintf  _snprintf
+  #define HAVE_UNISTD_H 0
+
+  #pragma warning(disable: 4244)
+  #pragma warning(disable: 4800)
+
+#else
+  /* Define to 1 if you have the <unistd.h> header file. */
+  #define HAVE_UNISTD_H 1
+#endif
+
+#if (defined(__GNUC__) && defined(__STRICT_ANSI__)) || (defined(_MSC_VER) && !defined(__cplusplus))   /* Visual Studio */
+#  define inline __inline           /* Visual C is not C99, but supports some kind of inline */
+#endif