Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update wxAUI documentation after wxBitmapBundle transition

Browse Source 
Change various occurrences of wxBitmap to wxBitmapBundle to reflect the
changes of 9a5123afed (Use wxBitmapBundle in wxAuiToolBar and
wxAuiPaneInfo too, 2021-11-14).

Closes #22106.
This commit is contained in:
Vadim Zeitlin
2022-02-07 21:49:25 +01:00
parent b401dfbdac
commit 85853db83b
3 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
interface/wx/aui/auibook.h
View File

@@ -633,7 +633,7 @@ public:
Returns the tab size for the given caption, bitmap and state. Returns the tab size for the given caption, bitmap and state.
*/ */
virtual wxSize GetTabSize(wxDC& dc, wxWindow* wnd, const wxString& caption, virtual wxSize GetTabSize(wxDC& dc, wxWindow* wnd, const wxString& caption,
const wxBitmap& bitmap, bool active, const wxBitmapBundle& bitmap, bool active,
int close_button_state, int* x_extent) = 0; int close_button_state, int* x_extent) = 0;
/** /**
@@ -810,7 +810,7 @@ public:
wxDC& dc, wxDC& dc,
wxWindow* wnd, wxWindow* wnd,
const wxString& caption, const wxString& caption,
const wxBitmap& bitmap, const wxBitmapBundle& bitmap,
bool active, bool active,
int closeButtonState, int closeButtonState,
int* xExtent); int* xExtent);
@@ -836,14 +836,14 @@ protected:
wxPen m_borderPen; wxPen m_borderPen;
wxBrush m_baseColourBrush; wxBrush m_baseColourBrush;
wxColour m_activeColour; wxColour m_activeColour;
wxBitmap m_activeCloseBmp; wxBitmapBundle m_activeCloseBmp;
wxBitmap m_disabledCloseBmp; wxBitmapBundle m_disabledCloseBmp;
wxBitmap m_activeLeftBmp; wxBitmapBundle m_activeLeftBmp;
wxBitmap m_disabledLeftBmp; wxBitmapBundle m_disabledLeftBmp;
wxBitmap m_activeRightBmp; wxBitmapBundle m_activeRightBmp;
wxBitmap m_disabledRightBmp; wxBitmapBundle m_disabledRightBmp;
wxBitmap m_activeWindowListBmp; wxBitmapBundle m_activeWindowListBmp;
wxBitmap m_disabledWindowListBmp; wxBitmapBundle m_disabledWindowListBmp;
int m_fixedTabWidth; int m_fixedTabWidth;
int m_tabCtrlHeight; int m_tabCtrlHeight;
@@ -940,14 +940,14 @@ protected:
wxBrush m_normalBkBrush; wxBrush m_normalBkBrush;
wxBrush m_selectedBkBrush; wxBrush m_selectedBkBrush;
wxBrush m_bkBrush; wxBrush m_bkBrush;
wxBitmap m_activeCloseBmp; wxBitmapBundle m_activeCloseBmp;
wxBitmap m_disabledCloseBmp; wxBitmapBundle m_disabledCloseBmp;
wxBitmap m_activeLeftBmp; wxBitmapBundle m_activeLeftBmp;
wxBitmap m_disabledLeftBmp; wxBitmapBundle m_disabledLeftBmp;
wxBitmap m_activeRightBmp; wxBitmapBundle m_activeRightBmp;
wxBitmap m_disabledRightBmp; wxBitmapBundle m_disabledRightBmp;
wxBitmap m_activeWindowListBmp; wxBitmapBundle m_activeWindowListBmp;
wxBitmap m_disabledWindowListBmp; wxBitmapBundle m_disabledWindowListBmp;
int m_fixedTabWidth; int m_fixedTabWidth;
unsigned int m_flags; unsigned int m_flags;

16
interface/wx/aui/dockart.h
View File

@@ -365,14 +365,14 @@ protected:
wxBrush m_backgroundBrush; wxBrush m_backgroundBrush;
wxBrush m_gripperBrush; wxBrush m_gripperBrush;
wxFont m_captionFont; wxFont m_captionFont;
wxBitmap m_inactiveCloseBitmap; wxBitmapBundle m_inactiveCloseBitmap;
wxBitmap m_inactivePinBitmap; wxBitmapBundle m_inactivePinBitmap;
wxBitmap m_inactiveMaximizeBitmap; wxBitmapBundle m_inactiveMaximizeBitmap;
wxBitmap m_inactiveRestoreBitmap; wxBitmapBundle m_inactiveRestoreBitmap;
wxBitmap m_activeCloseBitmap; wxBitmapBundle m_activeCloseBitmap;
wxBitmap m_activePinBitmap; wxBitmapBundle m_activePinBitmap;
wxBitmap m_activeMaximizeBitmap; wxBitmapBundle m_activeMaximizeBitmap;
wxBitmap m_activeRestoreBitmap; wxBitmapBundle m_activeRestoreBitmap;
wxPen m_gripperPen1; wxPen m_gripperPen1;
wxPen m_gripperPen2; wxPen m_gripperPen2;
wxPen m_gripperPen3; wxPen m_gripperPen3;

2
interface/wx/aui/framemanager.h
View File

@@ -991,7 +991,7 @@ public:
wxString caption; wxString caption;
/// icon of the pane, may be invalid /// icon of the pane, may be invalid
wxBitmap icon; wxBitmapBundle icon;
/// window that is in this pane /// window that is in this pane
wxWindow* window; wxWindow* window;