wip

GeoDaCenter · Oct 9, 2024 · eba0598 · eba0598
1 parent 6cbcc8c
commit eba0598
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/BuildTools/macosx/GNUmakefile b/BuildTools/macosx/GNUmakefile
@@ -112,18 +112,17 @@ build-geoda-mac:
 	cp /usr/local/opt/proj/share/proj/deformation_model.schema.json build/GeoDa.app/Contents/Resources/proj
 	cp /usr/local/opt/proj/share/proj/triangulation.schema.json build/GeoDa.app/Contents/Resources/proj
 	cp /usr/local/opt/proj/share/proj/world build/GeoDa.app/Contents/Resources/proj
-	cp libraries/lib/libwx_osx_cocoau-3.2.0.2.2.dylib build/GeoDa.app/Contents/Frameworks/libwx_osx_cocoau-3.2.dylib
-	cp libraries/lib/libwx_osx_cocoau_gl-3.2.0.2.2.dylib build/GeoDa.app/Contents/Frameworks/libwx_osx_cocoau_gl-3.2.dylib
+	cp libraries/lib/libwx_osx_cocoau-3.2.dylib build/GeoDa.app/Contents/Frameworks/libwx_osx_cocoau-3.2.dylib
+	cp libraries/lib/libwx_osx_cocoau_gl-3.2.dylib build/GeoDa.app/Contents/Frameworks/libwx_osx_cocoau_gl-3.2.dylib
 	cp /usr/local/opt/gdal/lib/libgdal.35.dylib build/GeoDa.app/Contents/Frameworks
 	install_name_tool -id "GeoDa" build/GeoDa.app/Contents/MacOS/GeoDa
 	install_name_tool -change "$(GEODA_HOME)/libraries/lib/libwx_osx_cocoau_gl-3.2.dylib" "@executable_path/../Frameworks/libwx_osx_cocoau_gl-3.2.dylib" build/GeoDa.app/Contents/MacOS/GeoDa
 	install_name_tool -change "$(GEODA_HOME)/libraries/lib/libwx_osx_cocoau-3.2.dylib" "@executable_path/../Frameworks/libwx_osx_cocoau-3.2.dylib" build/GeoDa.app/Contents/MacOS/GeoDa
 	install_name_tool -change "/usr/local/opt/gdal/lib/libgdal.35.dylib" "@executable_path/../Frameworks/libgdal.35.dylib" build/GeoDa.app/Contents/MacOS/GeoDa
 	install_name_tool -change "/opt/homebrew/opt/gdal/lib/libgdal.35.dylib" "@executable_path/../Frameworks/libgdal.35.dylib" build/GeoDa.app/Contents/MacOS/GeoDa
 	python3 install_name.py $(GEODA_HOME)/build/GeoDa.app/Contents/Frameworks "Developer ID Application: Geodapress LLC (26M5NG43GP)"
-	install_name_tool -change "@executable_path/../Frameworks/libwx_osx_cocoau-3.2.0.2.2.dylib" "@executable_path/../Frameworks/libwx_osx_cocoau-3.2.dylib" build/GeoDa.app/Contents/Frameworks/libwx_osx_cocoau_gl-3.2.dylib
+	install_name_tool -change "@executable_path/../Frameworks/libwx_osx_cocoau-3.2.dylib" "@executable_path/../Frameworks/libwx_osx_cocoau-3.2.dylib" build/GeoDa.app/Contents/Frameworks/libwx_osx_cocoau_gl-3.2.dylib
 	codesign -f --timestamp -o runtime -s "Developer ID Application: Geodapress LLC (26M5NG43GP)" build/GeoDa.app/Contents/Frameworks/libwx_osx_cocoau_gl-3.2.dylib
-	codesign -f --timestamp -o runtime -s "Developer ID Application: Geodapress LLC (26M5NG43GP)" build/GeoDa.app/Contents/Frameworks/libwx_osx_cocoau-3.2.0.2.2.dylib
 	codesign -f --timestamp -o runtime -s "Developer ID Application: Geodapress LLC (26M5NG43GP)" build/GeoDa.app/Contents/Frameworks/libwx_osx_cocoau-3.2.dylib
 	codesign -f --timestamp -o runtime -s "Developer ID Application: Geodapress LLC (26M5NG43GP)" build/GeoDa.app/Contents/MacOS/lisa_kernel.cl
 	codesign -f --timestamp -o runtime -s "Developer ID Application: Geodapress LLC (26M5NG43GP)" build/GeoDa.app/Contents/MacOS/GeoDa

diff --git a/DialogTools/ConnectDatasourceDlg.cpp b/DialogTools/ConnectDatasourceDlg.cpp
@@ -966,14 +966,14 @@ void ConnectDatasourceDlg::InitSamplePanel() {
   sample_scrl->SetBackgroundColour(*wxWHITE);
 #endif
   {
-    wxBoxSizer* sizer;
-    sizer = new wxBoxSizer(wxVERTICAL);
+    wxBoxSizer* sample_sizer;
+    sample_sizer = new wxBoxSizer(wxVERTICAL);
     for (size_t i = 0; i < GdaConst::sample_names.size(); i++) {
       wxString sample_name = GdaConst::sample_names[i];
       wxString sample_meta_url = GdaConst::sample_meta_urls[i];
       wxString ds_layername = GdaConst::sample_layer_names[i];
       wxString ds_thumb = GdaConst::sample_layer_names[i];
-      AddSampleItem(sizer, sample_scrl, sample_name, sample_meta_url, ds_layername, ds_thumb,
+      AddSampleItem(sample_sizer, sample_scrl, sample_name, sample_meta_url, ds_layername, ds_thumb,
                     base_xrcid_sample_thumb + static_cast<int>(i));
     }
     sample_scrl->SetSizer(sizer);