Merge branch 'maint16_2' into merge2to3

# Conflicts:
#	.github/workflows/tools.yml
#	src/core/list.h

Author: tturocy

.github/workflows/osxbinary.yml

@@ -0,0 +1,37 @@
+name: MacOS static GUI binary
+
+on:
+  push:
+    tags:
+      - 'v*'
+  schedule:
+    - cron: '0 6 * * 4'
+
+jobs:
+  macos-13:
+    runs-on: macos-13
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install dependencies
+        run: |
+            brew install automake autoconf
+            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
+            make -j4
+            sudo make install
+      - run: aclocal
+      - run: automake --add-missing
+      - run: autoconf
+      - run: ./configure
+      - run: make
+      - run: sudo make install
+      - run: make osx-dmg
+      - uses: actions/upload-artifact@v4
+        with:
+          name: artifact-osx-13
+          path: "*.dmg"

.github/workflows/tools.yml

@@ -83,7 +83,7 @@ jobs:
       - uses: msys2/setup-msys2@v2
         with:
           install: mingw-w64-x86_64-toolchain make automake autoconf
-      - run: pacman -S --noconfirm mingw-w64-x86_64-wxmsw3.2
+      - run: pacman -S --noconfirm mingw-w64-x86_64-wxwidgets3.2
       - run: aclocal
       - run: automake --add-missing
       - run: autoconf

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

doc/pygambit.api.rst

@@ -130,6 +130,7 @@ Information about the game
    :toctree: api/
 
    Outcome.label
+   Outcome.number
    Outcome.game
 
 .. autosummary::

src/gui/efgdisplay.cc

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

src/gui/efgpanel.cc

@@ -198,10 +198,10 @@ gbtTreePlayerIcon::gbtTreePlayerIcon(wxWindow *p_parent, int p_player)
 
 void gbtTreePlayerIcon::OnLeftClick(wxMouseEvent &)
 {
-  wxBitmap bitmap(person_xpm);
+  const wxBitmap bitmap(person_xpm);
 
 #if defined(__WXMSW__) or defined(__WXMAC__)
-  wxImage image = bitmap.ConvertToImage();
+  const auto image = wxCursor(bitmap.ConvertToImage());
 #else
   wxIcon image;
   image.CopyFromBitmap(bitmap);
@@ -460,7 +460,7 @@ void gbtTreeChanceIcon::OnLeftClick(wxMouseEvent &)
   wxBitmap bitmap(dice_xpm);
 
 #if defined(__WXMSW__) or defined(__WXMAC__)
-  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 &)
   wxBitmap bitmap(person_xpm);
 
 #if defined(__WXMSW__) or defined(__WXMAC__)
-  wxImage image = bitmap.ConvertToImage();
+  const auto image = wxCursor(bitmap.ConvertToImage());
 #else
   wxIcon image;
   image.CopyFromBitmap(bitmap);

src/pygambit/outcome.pxi

@@ -72,6 +72,13 @@ class Outcome:
             warnings.warn("Another outcome with an identical label exists")
         self.outcome.deref().SetLabel(value.encode("ascii"))
 
+    @property
+    def number(self) -> int:
+        """Returns the number of the outcome in the game.
+        Outcomes are numbered starting with 0.
+        """
+        return self.outcome.deref().GetNumber() - 1
+
     def __getitem__(
             self, player: typing.Union[Player, str]
     ) -> typing.Union[decimal.Decimal, Rational]: