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 ffd6c88c6006e5264d4bd48c9c856c242147e286..1a23a850402f52429783fb89efba65413c8cc080 100644 (file)
--- 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() )
     {
     
     if ( tool->IsButton() )
     {

-        wxBitmap bitmap = tool->GetBitmap1();
+        wxBitmap bitmap = tool->GetNormalBitmap();

 
         wxCHECK_MSG( bitmap.Ok(), FALSE,
                      wxT("invalid bitmap for wxToolBar icon") );
 
         wxCHECK_MSG( bitmap.Ok(), FALSE,
                      wxT("invalid bitmap for wxToolBar icon") );

diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp
index ffd6c88c6006e5264d4bd48c9c856c242147e286..1a23a850402f52429783fb89efba65413c8cc080 100644 (file)
--- 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() )
     {
     
     if ( tool->IsButton() )
     {

-        wxBitmap bitmap = tool->GetBitmap1();
+        wxBitmap bitmap = tool->GetNormalBitmap();

 
         wxCHECK_MSG( bitmap.Ok(), FALSE,
                      wxT("invalid bitmap for wxToolBar icon") );
 
         wxCHECK_MSG( bitmap.Ok(), FALSE,
                      wxT("invalid bitmap for wxToolBar icon") );