/
wxwidgets.patch
44 lines (38 loc) · 1.91 KB
/
wxwidgets.patch
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
35
36
37
38
39
40
41
42
43
44
diff --git a/src/ui/aui/AuiNotebook.cpp b/src/ui/aui/AuiNotebook.cpp
index f8178e4c..9c85f685 100644
--- a/src/ui/aui/AuiNotebook.cpp
+++ b/src/ui/aui/AuiNotebook.cpp
@@ -293,7 +293,7 @@ void guAuiTabArt::DrawTab(wxDC &dc, wxWindow * wnd, const wxAuiNotebookPage &pag
int close_button_width = 0;
if( close_button_state != wxAUI_BUTTON_STATE_HIDDEN )
{
- close_button_width = m_activeCloseBmp.GetWidth();
+ close_button_width = m_activeCloseBmp.GetDefaultSize().GetWidth();
}
@@ -303,12 +303,12 @@ void guAuiTabArt::DrawTab(wxDC &dc, wxWindow * wnd, const wxAuiNotebookPage &pag
bitmap_offset = tab_x + 8;
// draw bitmap
- dc.DrawBitmap(page.bitmap,
+ dc.DrawBitmap(page.bitmap.GetBitmap(page.bitmap.GetDefaultSize()), // page.bitmap,
bitmap_offset,
- drawn_tab_yoff + (drawn_tab_height/2) - (page.bitmap.GetHeight()/2),
+ drawn_tab_yoff + (drawn_tab_height/2) - (page.bitmap.GetDefaultSize().GetHeight()/2),
true);
- text_offset = bitmap_offset + page.bitmap.GetWidth();
+ text_offset = bitmap_offset + page.bitmap.GetDefaultSize().GetWidth();
text_offset += 3; // bitmap padding
}
else
@@ -331,12 +331,12 @@ void guAuiTabArt::DrawTab(wxDC &dc, wxWindow * wnd, const wxAuiNotebookPage &pag
// draw close button if necessary
if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
{
- wxBitmap bmp = m_disabledCloseBmp;
+ wxBitmap bmp = m_disabledCloseBmp.GetBitmap(m_disabledCloseBmp.GetDefaultSize());
if (close_button_state == wxAUI_BUTTON_STATE_HOVER ||
close_button_state == wxAUI_BUTTON_STATE_PRESSED)
{
- bmp = m_activeCloseBmp;
+ bmp = m_activeCloseBmp.GetBitmap(m_activeCloseBmp.GetDefaultSize());
}
wxRect rect(tab_x + tab_width - close_button_width - 1,