Don't use -kAddToPopUp() gettext hack with Scintilla.

[wxWidgets.git] / src / os2 / toolbar.cpp

diff --git a/src/os2/toolbar.cpp b/src/os2/toolbar.cpp
index edc47523742a00dc933c45c68e9640f445885bea..8ebc9a0f3e5eea37a8f867792b04c7f59fdb41fe 100644 (file)
--- a/src/os2/toolbar.cpp
+++ b/src/os2/toolbar.cpp
@@ -26,6 +26,7 @@
 #endif
 
 #include "wx/tooltip.h"
 #endif
 
 #include "wx/tooltip.h"

+#include "wx/os2/dcclient.h"

 
 bool wxToolBar::m_bInitialized = false;
 
 
 bool wxToolBar::m_bInitialized = false;
 


@@ -601,7 +602,8 @@ void wxToolBar::OnPaint (
         return;
     nCount++;
 
         return;
     nCount++;
 

-    ::WinFillRect(vDc.GetHPS(), &vDc.m_vRclPaint, GetBackgroundColour().GetPixel());
+    wxPMDCImpl *impl = (wxPMDCImpl*) vDc.GetImpl();
+    ::WinFillRect(impl->GetHPS(), &impl->m_vRclPaint, GetBackgroundColour().GetPixel());

     for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
           node;
           node = node->GetNext() )
     for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
           node;
           node = node->GetNext() )


@@ -933,7 +935,7 @@ void wxToolBar::SetRows(
   int                               nRows
 )
 {
   int                               nRows
 )
 {

-    wxCHECK_RET( nRows != 0, _T("max number of rows must be > 0") );
+    wxCHECK_RET( nRows != 0, wxT("max number of rows must be > 0") );

 
     m_maxCols = (GetToolsCount() + nRows - 1) / nRows;
     Refresh();
 
     m_maxCols = (GetToolsCount() + nRows - 1) / nRows;
     Refresh();


@@ -977,7 +979,7 @@ wxToolBarToolBase* wxToolBar::FindToolForPosition(
         }
         node = node->GetNext();
     }
         }
         node = node->GetNext();
     }

-    return (wxToolBarToolBase *)NULL;
+    return NULL;

 } // end of wxToolBar::FindToolForPosition
 
 // ----------------------------------------------------------------------------
 } // end of wxToolBar::FindToolForPosition
 
 // ----------------------------------------------------------------------------