Correct Windows build

OpenCPN · Jun 28, 2016 · b79a351 · b79a351
1 parent e4dc823
commit b79a351
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/plugins/grib_pi/src/GribUIDialog.cpp b/plugins/grib_pi/src/GribUIDialog.cpp
@@ -699,7 +699,9 @@ void GRIBUICtrlBar::OnAltitude( wxCommandEvent& event )
     wxMenu* amenu = new wxMenu();
     amenu->Connect( wxEVT_COMMAND_MENU_SELECTED, wxMenuEventHandler(GRIBUICtrlBar::OnMenuEvent), NULL, this );
 
-///    const wxString l[] = { _T(" "), wxString::Format( _T("\u2022") ) };
+#ifdef __WXMSW__
+    const wxString l[] = { _T(" "), wxString::Format( _T("\u2022") ) };
+#endif
     for( int i = 0; i<5; i++) {
         if( (( m_pTimelineSet && m_bGRIBActiveFile->m_GribIdxArray.Index(Idx_WIND_VX + i) != wxNOT_FOUND
                     && m_bGRIBActiveFile->m_GribIdxArray.Index(Idx_WIND_VY + i) != wxNOT_FOUND )) || i == 0 ) {
@@ -806,7 +808,9 @@ void GRIBUICtrlBar::OnMouseEvent( wxMouseEvent& event )
             wxMenu* smenu = new wxMenu();
             smenu->Connect( wxEVT_COMMAND_MENU_SELECTED, wxMenuEventHandler(GRIBUICtrlBar::OnMenuEvent), NULL, this );
 
-///            const wxString l[] = { _T(" "), wxString::Format( _T("\u2022") ) };
+#ifdef __WXMSW__
+            const wxString l[] = { _T(" "), wxString::Format( _T("\u2022") ) };
+#endif
             for( int i = 0; i<5; i++) {
                 if( (( m_pTimelineSet && m_bGRIBActiveFile->m_GribIdxArray.Index(Idx_WIND_VX + i) != wxNOT_FOUND
                         && m_bGRIBActiveFile->m_GribIdxArray.Index(Idx_WIND_VY + i) != wxNOT_FOUND )) || i == 0 ) {

diff --git a/src/Track.cpp b/src/Track.cpp
@@ -99,6 +99,7 @@ extern double           g_TrackDeltaDistance;
 extern RouteProp                 *pRoutePropDialog;
 extern float            g_GLMinSymbolLineWidth;
 
+#if defined( __UNIX__ ) && !defined(__WXOSX__)  // high resolution stopwatch for profiling
 class OCPNStopWatch
 {
 public:
@@ -114,6 +115,7 @@ class OCPNStopWatch
 private:
     timespec tp;
 };
+#endif
 
 #include <wx/listimpl.cpp>
 WX_DEFINE_LIST ( TrackList );

diff --git a/src/canvasMenu.cpp b/src/canvasMenu.cpp
@@ -113,7 +113,7 @@ extern RouteManagerDialog *pRouteManagerDialog;
 extern MarkInfoImpl     *pMarkPropDialog;
 extern RouteProp        *pRoutePropDialog;
 extern TrackPropDlg     *pTrackPropDialog;
-extern Track            *g_pActiveTrack;
+extern ActiveTrack      *g_pActiveTrack;
 extern bool             g_bConfirmObjectDelete;
 extern WayPointman      *pWayPointMan;
 extern MyConfig         *pConfig;

diff --git a/src/routeman.cpp b/src/routeman.cpp
@@ -81,7 +81,7 @@ extern bool             g_bMagneticAPB;
 extern RoutePoint       *pAnchorWatchPoint1;
 extern RoutePoint       *pAnchorWatchPoint2;
 
-extern Track            *g_pActiveTrack;
+extern ActiveTrack      *g_pActiveTrack;
 extern RouteProp        *pRoutePropDialog;
 extern RouteManagerDialog *pRouteManagerDialog;
 extern RoutePoint      *pAnchorWatchPoint1;

diff --git a/src/routemanagerdialog.cpp b/src/routemanagerdialog.cpp
@@ -128,7 +128,7 @@ extern Routeman  *g_pRouteMan;
 extern MyConfig  *pConfig;
 extern ChartCanvas *cc1;
 extern ChartBase *Current_Ch;
-extern Track     *g_pActiveTrack;
+extern ActiveTrack      *g_pActiveTrack;
 extern WayPointman      *pWayPointMan;
 extern MarkInfoImpl     *pMarkPropDialog;
 extern MyFrame          *gFrame;