From: Václav Slavík Date: Sun, 24 Mar 2002 00:19:24 +0000 (+0000) Subject: compilation fix for WXWIN_COMPATIBILITY_2_2 X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3a72b4eff0398618c139cdf1d5b8b45a140e4836 compilation fix for WXWIN_COMPATIBILITY_2_2 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index ffd6c88c60..1a23a85040 100644 --- a/src/gtk/tbargtk.cpp +++ b/src/gtk/tbargtk.cpp @@ -302,7 +302,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) if ( tool->IsButton() ) { - wxBitmap bitmap = tool->GetBitmap1(); + wxBitmap bitmap = tool->GetNormalBitmap(); wxCHECK_MSG( bitmap.Ok(), FALSE, wxT("invalid bitmap for wxToolBar icon") ); diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp index ffd6c88c60..1a23a85040 100644 --- a/src/gtk1/tbargtk.cpp +++ b/src/gtk1/tbargtk.cpp @@ -302,7 +302,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) if ( tool->IsButton() ) { - wxBitmap bitmap = tool->GetBitmap1(); + wxBitmap bitmap = tool->GetNormalBitmap(); wxCHECK_MSG( bitmap.Ok(), FALSE, wxT("invalid bitmap for wxToolBar icon") );