From c97aae8dfb03a965a97fb9c12202c6f551b6dd22 Mon Sep 17 00:00:00 2001
From: Matthew Mott <orbweaver3d@gmail.com>
Date: Sat, 20 Apr 2024 13:52:41 +0100
Subject: [PATCH] Add a wxutil::IconButton() convenience function

---
 libs/wxutil/Bitmap.h                             |  8 +++++++-
 radiant/ui/surfaceinspector/SurfaceInspector.cpp | 16 ++++------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/libs/wxutil/Bitmap.h b/libs/wxutil/Bitmap.h
index fe542d284..bee3d0dc3 100644
--- a/libs/wxutil/Bitmap.h
+++ b/libs/wxutil/Bitmap.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "wxutil/Bitmap.h"
 #include <wx/artprov.h>
+#include <wx/bmpbuttn.h>
 
 namespace wxutil
 {
@@ -31,4 +31,10 @@ inline wxBitmap GetLocalBitmap(const std::string& name, const wxArtClient& clien
     return wxArtProvider::GetBitmap("darkradiant:" + name, client);
 }
 
+/// Construct and return a wxBitmapButton displaying the given local icon
+inline wxBitmapButton* IconButton(wxWindow* parent, const std::string& iconFile)
+{
+    return new wxBitmapButton(parent, wxID_ANY, GetLocalBitmap(iconFile));
+}
+
 }
diff --git a/radiant/ui/surfaceinspector/SurfaceInspector.cpp b/radiant/ui/surfaceinspector/SurfaceInspector.cpp
index b079eb012..3ab78e26b 100644
--- a/radiant/ui/surfaceinspector/SurfaceInspector.cpp
+++ b/radiant/ui/surfaceinspector/SurfaceInspector.cpp
@@ -445,18 +445,10 @@ void SurfaceInspector::populateWindow()
 
 	_alignTexture.label = new wxStaticText(this, wxID_ANY, _(LABEL_ALIGN_TEXTURE));
 
-    _alignTexture.top = new wxBitmapButton(
-        this, wxID_ANY, wxutil::GetLocalBitmap("align_top.png")
-    );
-    _alignTexture.bottom = new wxBitmapButton(
-        this, wxID_ANY, wxutil::GetLocalBitmap("align_bottom.png")
-    );
-    _alignTexture.left = new wxBitmapButton(
-        this, wxID_ANY, wxutil::GetLocalBitmap("align_left.png")
-    );
-    _alignTexture.right = new wxBitmapButton(
-        this, wxID_ANY, wxutil::GetLocalBitmap("align_right.png")
-    );
+    _alignTexture.top = wxutil::IconButton(this, "align_top.png");
+    _alignTexture.bottom = wxutil::IconButton(this, "align_bottom.png");
+    _alignTexture.left = wxutil::IconButton(this, "align_left.png");
+    _alignTexture.right = wxutil::IconButton(this, "align_right.png");
 
     _alignTexture.top->SetMinSize(PixelSize(20, -1));
     _alignTexture.bottom->SetMinSize(PixelSize(20, -1));