[Bug] the sample list items are overflow the notebook container (#2502)

Author: lixun910

BuildTools/macosx/GNUmakefile

@@ -112,18 +112,18 @@ 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.0.3.0.dylib build/GeoDa.app/Contents/Frameworks/libwx_osx_cocoau-3.2.dylib
+	cp libraries/lib/libwx_osx_cocoau_gl-3.2.0.3.0.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 "$(GEODA_HOME)/libraries/lib/libwx_osx_cocoau_gl-3.2.0.3.0.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.0.3.0.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.0.3.0.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.0.3.0.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

BuildTools/macosx/install.sh

@@ -61,13 +61,13 @@ if ! [ -f "../libraries/lib/libboost_thread.a" ]; then
     cd ..
 fi
 
-# Build wxWidgets 3.2.4
-if ! [ -f "wxWidgets-3.2.4.tar.bz2" ]; then
-    curl -L -O https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.4/wxWidgets-3.2.4.tar.bz2
-    tar -xf wxWidgets-3.2.4.tar.bz2
+# Build wxWidgets 3.2.6
+if ! [ -f "wxWidgets-3.2.6.tar.bz2" ]; then
+    curl -L -O https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.6/wxWidgets-3.2.6.tar.bz2
+    tar -xf wxWidgets-3.2.6.tar.bz2
 fi
 if ! [ -f "../libraries/bin/wx-config" ]; then
-    cd wxWidgets-3.2.4
+    cd wxWidgets-3.2.6
     ./configure --with-cocoa --with-opengl --enable-postscript --enable-textfile --without-liblzma --enable-webview --enable-cxx11 --disable-mediactrl --enable-webviewwebkit --enable-monolithic --with-libtiff=builtin --with-libpng=builtin --with-libjpeg=builtin --prefix=$GEODA_HOME/libraries
     make -j $CPUS
     make install

DialogTools/ConnectDatasourceDlg.cpp

@@ -966,19 +966,19 @@ 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);
+    sample_scrl->SetSizer(sample_sizer);
     sample_scrl->Layout();
-    sizer->Fit(sample_scrl);
+    sample_sizer->Fit(sample_scrl);
   }
 
   sizer->Add(sample_scrl, 1, wxEXPAND | wxRIGHT, 5);