File wxformbuilder-3.10.1-fix-build-with-wx-3.1.6.patch of Package wxformbuilder

Overview Repositories Revisions Requests Users Attributes Meta

File wxformbuilder-3.10.1-fix-build-with-wx-3.1.6.patch of Package wxformbuilder (Revision 2fabe43691ee3f8f29a8401dc9568bcc)

Currently displaying revision 2fabe43691ee3f8f29a8401dc9568bcc , Show latest

From 8042f487aed39c287bb308e09fa3ea38bd9dfef4 Mon Sep 17 00:00:00 2001
From: Steffen Olszewski <steffen.olszewski@gero-mess.de>
Date: Sat, 12 Feb 2022 00:49:28 +0100
Subject: [PATCH] Fix compilation of AuiTabArt for wxWidgets 3.1.6

Use wxBitmapBundle for that version.
---
 src/rad/auitabart.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/rad/auitabart.h b/src/rad/auitabart.h
index 130dbd882..d8a1c2279 100644
--- a/src/rad/auitabart.h
+++ b/src/rad/auitabart.h
@@ -5,11 +5,12 @@
 
 class AuiTabArt : public wxAuiGenericTabArt {
 public:
-	wxSize GetTabSize(wxDC& dc, wxWindow* wnd, const wxString& caption, const wxBitmap& bitmap,
-	                  bool active, int close_button_state, int* x_extent) override {
-		return wxAuiGenericTabArt::GetTabSize(dc, wnd, caption, bitmap, active, close_button_state,
-		                                      x_extent) +
-		       wxSize(0, 2);
+	#if wxCHECK_VERSION(3, 1, 6)
+	wxSize GetTabSize(wxDC& dc, wxWindow* wnd, const wxString& caption, const wxBitmapBundle& bitmap, bool active, int close_button_state, int* x_extent) override {
+	#else
+	wxSize GetTabSize(wxDC& dc, wxWindow* wnd, const wxString& caption, const wxBitmap& bitmap, bool active, int close_button_state, int* x_extent) override {
+	#endif
+		return wxAuiGenericTabArt::GetTabSize(dc, wnd, caption, bitmap, active, close_button_state, x_extent) + wxSize(0, 2);
 	}
 };

Places

File wxformbuilder-3.10.1-fix-build-with-wx-3.1.6.patch of Package wxformbuilder (Revision 2fabe43691ee3f8f29a8401dc9568bcc)

Places