X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ed0fac8a854bf53ea942ba7d759519f0c681763..aa9a4ae1a54ab701d1e12d8a9bddf1ddd81a9a1a:/include/wx/os2/toolbar.h diff --git a/include/wx/os2/toolbar.h b/include/wx/os2/toolbar.h index b17e12d463..6fff034fd2 100644 --- a/include/wx/os2/toolbar.h +++ b/include/wx/os2/toolbar.h @@ -48,6 +48,11 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase wxToolBarTool *AddTool(int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap, bool toggle = FALSE, long xPos = -1, long yPos = -1, wxObject *clientData = NULL, const wxString& helpString1 = "", const wxString& helpString2 = ""); + //Virtual function hiding suppression + inline wxToolBarTool *AddTool(int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap, + bool toggle = FALSE, wxCoord xPos = -1, wxCoord yPos = -1, wxObject *clientData = NULL, + const wxString& helpString1 = "", const wxString& helpString2 = "") + { return(AddTool(toolIndex, bitmap, pushedBitmap, toggle, (long)xPos, (long)yPos, clientData, helpString1, helpString2)); } // Set default bitmap size void SetToolBitmapSize(const wxSize& size); @@ -81,12 +86,6 @@ protected: WXHBITMAP m_hBitmap; DECLARE_EVENT_TABLE() -private: - //Virtual function hiding suppression - inline wxToolBarTool *AddTool(int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap, - bool toggle = FALSE, wxCoord xPos = -1, wxCoord yPos = -1, wxObject *clientData = NULL, - const wxString& helpString1 = "", const wxString& helpString2 = "") - { return(AddTool(toolIndex, bitmap, pushedBitmap, toggle, (long)xPos, (long)yPos, clientData, helpString1, helpString2)); } }; #endif // wxUSE_TOOLBAR