From 5ca3157467d57e5f8aad634ce3e1b6dd770b4a1f Mon Sep 17 00:00:00 2001
From: PB <pbfordev@gmail.com>
Date: Sat, 30 Sep 2023 21:39:42 +0200
Subject: [PATCH] Fix return type of wxBitmap::UseAlpha() under wxMSW

The method should return bool but was returning void.

This commit is best viewed ignoring whitespace-only changes.

Closes #23903, #23919.
---
 include/wx/msw/bitmap.h |  2 +-
 src/msw/bitmap.cpp      | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h
index 9293963d34..2e3f278260 100644
--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -177,7 +177,7 @@ public:
     void SetMask(wxMask *mask);
 
     bool HasAlpha() const;
-    void UseAlpha(bool use = true);
+    bool UseAlpha(bool use = true);
     void ResetAlpha() { UseAlpha(false); }
 
     // old synonyms for CreateWithDIPSize() and GetLogicalXXX() functions
diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 80b650087c..5b007e3788 100644
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -1222,16 +1222,15 @@ wxDC *wxBitmap::GetSelectedInto() const
 #endif
 }
 
-void wxBitmap::UseAlpha(bool use)
+bool wxBitmap::UseAlpha(bool use)
 {
-    if ( GetBitmapData() )
-    {
-        // Only 32bpp bitmaps can contain alpha channel.
-        if ( use && GetBitmapData()->m_depth < 32 )
-            use = false;
+    // Only 32bpp bitmaps can contain alpha channel.
+    if ( !GetBitmapData() || (use && GetBitmapData()->m_depth < 32) )
+        return false;
 
-        GetBitmapData()->m_hasAlpha = use;
-    }
+    GetBitmapData()->m_hasAlpha = use;
+
+    return true;
 }
 
 bool wxBitmap::HasAlpha() const