Skip to content

Commit 2b6bce1

Browse files
committed
Restore recently removed wxAuiGenericTabArt::m_tabCtrlHeight
This variable was removed as part of the changes of 1fa80f2 (Add wxAUI_NB_MULTILINE for multiple tabs rows in wxAuiNotebook, 2025-01-06) but it turns out that there is existing code relying on this member variable existence, so preserve it for compatibility, even if this class doesn't use it itself any longer. Closes wxWidgets#25192.
1 parent 4d5fbf5 commit 2b6bce1

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

include/wx/aui/tabart.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ class WXDLLIMPEXP_AUI wxAuiGenericTabArt : public wxAuiTabArt
248248
wxBitmapBundle m_disabledWindowListBmp;
249249

250250
int m_fixedTabWidth;
251+
int m_tabCtrlHeight; // Unused, kept only for compatibility.
251252
unsigned int m_flags;
252253

253254
private:

src/aui/tabart.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ wxAuiGenericTabArt::wxAuiGenericTabArt()
193193
m_measuringFont = m_selectedFont;
194194

195195
m_fixedTabWidth = wxWindow::FromDIP(100, nullptr);
196+
m_tabCtrlHeight = 0;
196197
m_flags = 0;
197198

198199
UpdateColoursFromSystem();
@@ -278,6 +279,11 @@ void wxAuiGenericTabArt::SetSizingInfo(const wxSize& tab_ctrl_size,
278279
m_fixedTabWidth = tot_width/2;
279280

280281
m_fixedTabWidth = wxMin(m_fixedTabWidth, wnd->FromDIP(220));
282+
283+
// We don't use this member variable ourselves any longer but keep it for
284+
// compatibility with the existing code, deriving from this class and using
285+
// it for its own purposes.
286+
m_tabCtrlHeight = tab_ctrl_size.y;
281287
}
282288

283289

0 commit comments

Comments
 (0)