1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
diff --unified --recursive --text a/src/rad/auitabart.h b/src/rad/auitabart.h
--- a/src/rad/auitabart.h 2021-10-22 18:19:37.000000000 +0200
+++ b/src/rad/auitabart.h 2022-08-13 11:32:26.550275012 +0200
@@ -3,14 +3,22 @@
#include <wx/aui/auibook.h>
-class AuiTabArt : public wxAuiGenericTabArt {
+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);
+}
+};
#endif // __AUITABART_H__
|