Add support for wxWidgets 3.3, bump minimum to 3.2

This updates to support wxWidgets 3.3.  This amounts to replacing an
obsolete version of the `wxDropTarget` constructor with a version that also works under 3.2.

This also bumps the minimum wxWidgets version to 3.2 from 3.1.

Author: tturocy

.github/workflows/osxbinary.yml

@@ -16,9 +16,9 @@ jobs:
       - name: Install dependencies
         run: |
             brew install automake autoconf
-            curl -L -O https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.6/wxWidgets-3.2.6.tar.bz2
-            tar xjf wxWidgets-3.2.6.tar.bz2
-            cd wxWidgets-3.2.6
+            curl -L -O https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.8/wxWidgets-3.2.8.tar.bz2
+            tar xjf wxWidgets-3.2.8.tar.bz2
+            cd wxWidgets-3.2.8
             mkdir build-release
             cd build-release
             ../configure --disable-shared --disable-sys-libs

.github/workflows/tools.yml

@@ -40,11 +40,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install dependencies
-        run: brew install automake autoconf wxwidgets@3.2
+        run: brew install automake autoconf wxwidgets
       - run: aclocal
       - run: automake --add-missing
       - run: autoconf
-      - run: ./configure --with-wx-config=wx-config-3.2
+      - run: ./configure
       - run: make
       - run: sudo make install
       - run: make osx-dmg

ChangeLog

@@ -4,6 +4,7 @@
 
 ### General
 - Officially added support for Python 3.13.
+- For graphical interface, added support for wxWidgets 3.3; require minimum of wxWidgets 3.2.
 
 ### Removed
 - The deprecated functions `Game.read_game`, `Game.parse_game` and `Game.write` functions have

configure.ac

@@ -63,15 +63,15 @@ if test x$with_gui = xtrue; then
   dnl------------------------
 
   dnl check for wx-config
-  AM_PATH_WXCONFIG(3.1.0, WXCONFIG=1)
+  AM_PATH_WXCONFIG(3.2.0, WXCONFIG=1)
   if test "$WXCONFIG" != 1; then
       AC_MSG_WARN([
             Did not find a new enough version of wxWidgets; disabling build of
             graphical interface.  If you want to build the graphical interface,
             please check that wx-config is in path, the directory
             where wxWidgets libraries are installed (returned by
             'wx-config --libs' command) is in LD_LIBRARY_PATH or
-            equivalent variable and wxWidgets is version 3.1.0 or above.
+            equivalent variable and wxWidgets is version 3.2.0 or above.
       ])
       AM_CONDITIONAL(WITH_GUI, test x0 = x1)
   fi

src/gui/efgdisplay.cc

@@ -852,7 +852,7 @@ void gbtEfgDisplay::OnMouseMotion(wxMouseEvent &p_event)
         // Copy subtree
         const wxBitmap bitmap(tree_xpm);
 #if defined(__WXMSW__) or defined(__WXMAC__)
-        const wxImage image = bitmap.ConvertToImage();
+        const auto image = wxCursor(bitmap.ConvertToImage());
 #else
         wxIcon image;
         image.CopyFromBitmap(bitmap);
@@ -867,7 +867,7 @@ void gbtEfgDisplay::OnMouseMotion(wxMouseEvent &p_event)
         // This should be the pawn icon!
         const wxBitmap bitmap(move_xpm);
 #if defined(__WXMSW__) or defined(__WXMAC__)
-        const wxImage image = bitmap.ConvertToImage();
+        const auto image = wxCursor(bitmap.ConvertToImage());
 #else
         wxIcon image;
         image.CopyFromBitmap(bitmap);
@@ -882,7 +882,7 @@ void gbtEfgDisplay::OnMouseMotion(wxMouseEvent &p_event)
         // Move subtree
         const wxBitmap bitmap(tree_xpm);
 #if defined(__WXMSW__) or defined(__WXMAC__)
-        const wxImage image = bitmap.ConvertToImage();
+        const auto image = wxCursor(bitmap.ConvertToImage());
 #else
         wxIcon image;
         image.CopyFromBitmap(bitmap);
@@ -901,7 +901,7 @@ void gbtEfgDisplay::OnMouseMotion(wxMouseEvent &p_event)
     if (node && node->GetOutcome()) {
       const wxBitmap bitmap = MakeOutcomeBitmap();
 #if defined(__WXMSW__) or defined(__WXMAC__)
-      const wxImage image = bitmap.ConvertToImage();
+      const auto image = wxCursor(bitmap.ConvertToImage());
 #else
       wxIcon image;
       image.CopyFromBitmap(bitmap);

src/gui/efgpanel.cc

@@ -201,7 +201,7 @@ void gbtTreePlayerIcon::OnLeftClick(wxMouseEvent &)
   const wxBitmap bitmap(person_xpm);
 
 #if defined(__WXMSW__) or defined(__WXMAC__)
-  const wxImage image = bitmap.ConvertToImage();
+  const auto image = wxCursor(bitmap.ConvertToImage());
 #else
   wxIcon image;
   image.CopyFromBitmap(bitmap);
@@ -460,7 +460,7 @@ void gbtTreeChanceIcon::OnLeftClick(wxMouseEvent &)
   const wxBitmap bitmap(dice_xpm);
 
 #if defined(__WXMSW__) or defined(__WXMAC__)
-  const wxImage image = bitmap.ConvertToImage();
+  const auto image = wxCursor(bitmap.ConvertToImage());
 #else
   wxIcon image;
   image.CopyFromBitmap(bitmap);

src/gui/nfgpanel.cc

@@ -69,7 +69,7 @@ void gbtTablePlayerIcon::OnLeftClick(wxMouseEvent &)
   const wxBitmap bitmap(person_xpm);
 
 #if defined(__WXMSW__) or defined(__WXMAC__)
-  const wxImage image = bitmap.ConvertToImage();
+  const auto image = wxCursor(bitmap.ConvertToImage());
 #else
   wxIcon image;
   image.CopyFromBitmap(bitmap);