Merge branch 'fix_201' of https://github.com/lixun910/geoda into fix_201

GeoDaCenter · Aug 25, 2019 · 5e83f3a · 5e83f3a
2 parents caaf98a + 140a4a8
commit 5e83f3a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/DialogTools/ExportDataDlg.cpp b/DialogTools/ExportDataDlg.cpp
@@ -613,7 +613,7 @@ ExportDataDlg::CreateOGRLayer(wxString& ds_name, bool is_table,
                                              table_p, selected_rows,
                                              spatial_ref, is_update, cpg_encode);
     if (new_layer == NULL) return false;
-#ifndef __linux__
+#ifdef __WXOSX__
     wxProgressDialog prog_dlg(_("Save data source progress dialog"),
                               _("Saving data..."),
                               prog_n_max, this,
@@ -625,7 +625,7 @@ ExportDataDlg::CreateOGRLayer(wxString& ds_name, bool is_table,
         if ( new_layer->stop_exporting == true )
             return false;
         // update progress bar
-#ifndef __linux__
+#ifdef __WXOSX__
         cont = prog_dlg.Update(new_layer->export_progress);
         if (!cont ) {
             new_layer->stop_exporting = true;

diff --git a/Project.cpp b/Project.cpp
@@ -604,7 +604,7 @@ void Project::SaveDataSourceAs(const wxString& new_ds_name, bool is_update)
 		// Start saving
 		int prog_n_max = 0;
 		if (table_int) prog_n_max = table_int->GetNumberRows();
-#ifndef __linux__
+#ifdef __WXOSX__
 		wxProgressDialog prog_dlg(_("Save data source progress dialog"),
                                   _("Saving data..."),
                                   prog_n_max, NULL,
@@ -623,7 +623,7 @@ void Project::SaveDataSourceAs(const wxString& new_ds_name, bool is_update)
 
         bool cont = true;
         while ( new_layer && new_layer->export_progress < prog_n_max ) {
-#ifndef __linux__
+#ifdef __WXOSX__
             cont = prog_dlg.Update(new_layer->export_progress);
             if ( !cont ) {
                 new_layer->stop_exporting = true;