correction to last commit: Korean and Romanian translations will only be in 2.9.1...

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

diff --git a/src/os2/toolbar.cpp b/src/os2/toolbar.cpp
index 55a5e314e364988d14d0857fca8ff84aa0428d8e..ebceb00abba3f819b8f9391dade7dd5b22c5a94b 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;
 


@@ -60,8 +61,10 @@ public:
 
     inline wxToolBarTool( wxToolBar* pTbar
                          ,wxControl* pControl
 
     inline wxToolBarTool( wxToolBar* pTbar
                          ,wxControl* pControl

+                         ,const wxString& label

                         ) : wxToolBarToolBase( pTbar
                                               ,pControl
                         ) : wxToolBarToolBase( pTbar
                                               ,pControl

+                                              ,label

                                              )
     {
     }
                                              )
     {
     }


@@ -128,10 +131,12 @@ wxToolBarToolBase* wxToolBar::CreateTool(
 
 wxToolBarToolBase *wxToolBar::CreateTool(
   wxControl*                        pControl
 
 wxToolBarToolBase *wxToolBar::CreateTool(
   wxControl*                        pControl

+, const wxString&                   label

 )
 {
     return new wxToolBarTool( this
                              ,pControl
 )
 {
     return new wxToolBarTool( this
                              ,pControl

+                             ,label

                             );
 } // end of wxToolBarSimple::CreateTool
 
                             );
 } // end of wxToolBarSimple::CreateTool
 


@@ -333,7 +338,7 @@ bool wxToolBar::Create( wxWindow* pParent,
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
     SetFont(*wxSMALL_FONT);
 
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
     SetFont(*wxSMALL_FONT);
 

-    if (GetWindowStyleFlag() & wxTB_VERTICAL)
+    if (GetWindowStyleFlag() & (wxTB_LEFT | wxTB_RIGHT))

     {
         m_vLastX = 7;
         m_vLastY = 3;
     {
         m_vLastX = 7;
         m_vLastY = 3;


@@ -375,7 +380,7 @@ bool wxToolBar::Create( wxWindow* pParent,
     int                             nWidth  = rSize.x;
     int                             nHeight = rSize.y;
 
     int                             nWidth  = rSize.x;
     int                             nHeight = rSize.y;
 

-    if (lStyle & (wxTB_HORIZONTAL | wxTB_BOTTOM))
+    if (lStyle & (wxTB_TOP | wxTB_BOTTOM))

     {
         if (nWidth <= 0)
         {
     {
         if (nWidth <= 0)
         {


@@ -499,7 +504,7 @@ bool wxToolBar::Realize()
 
         if (pTool->IsSeparator())
         {
 
         if (pTool->IsSeparator())
         {

-            if (GetWindowStyleFlag() & (wxTB_HORIZONTAL | wxTB_BOTTOM))
+            if (GetWindowStyleFlag() & (wxTB_TOP | wxTB_BOTTOM))

             {
                 pTool->m_vX = m_vLastX + nSeparatorSize;
                 pTool->m_vHeight = m_defaultHeight + m_vTextY;
             {
                 pTool->m_vX = m_vLastX + nSeparatorSize;
                 pTool->m_vHeight = m_defaultHeight + m_vTextY;


@@ -520,7 +525,7 @@ bool wxToolBar::Realize()
         }
         else if (pTool->IsButton())
         {
         }
         else if (pTool->IsButton())
         {

-            if (GetWindowStyleFlag() & (wxTB_HORIZONTAL | wxTB_BOTTOM))
+            if (GetWindowStyleFlag() & (wxTB_TOP | wxTB_BOTTOM))

             {
                 if (m_nCurrentRowsOrColumns >= m_maxCols)
                 {
             {
                 if (m_nCurrentRowsOrColumns >= m_maxCols)
                 {


@@ -565,7 +570,7 @@ bool wxToolBar::Realize()
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 

-    if (GetWindowStyleFlag() & (wxTB_HORIZONTAL | wxTB_BOTTOM))
+    if (GetWindowStyleFlag() & (wxTB_TOP | wxTB_BOTTOM))

         m_maxWidth += nMaxToolWidth;
     else
         m_maxHeight += nMaxToolHeight;
         m_maxWidth += nMaxToolWidth;
     else
         m_maxHeight += nMaxToolHeight;


@@ -597,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() )


@@ -618,7 +624,7 @@ void wxToolBar::OnPaint (
             vDc.SetPen(vDarkGreyPen);
             if (HasFlag(wxTB_TEXT))
             {
             vDc.SetPen(vDarkGreyPen);
             if (HasFlag(wxTB_TEXT))
             {

-                if (HasFlag(wxTB_HORIZONTAL) || HasFlag(wxTB_BOTTOM))
+                if (HasFlag(wxTB_TOP) || HasFlag(wxTB_BOTTOM))

                 {
                     nX = pTool->m_vX;
                     nY = pTool->m_vY - (m_vTextY - 6);
                 {
                     nX = pTool->m_vX;
                     nY = pTool->m_vY - (m_vTextY - 6);


@@ -635,7 +641,7 @@ void wxToolBar::OnPaint (
             {
                 nX = pTool->m_vX;
                 nY = pTool->m_vY;
             {
                 nX = pTool->m_vX;
                 nY = pTool->m_vY;

-                if (HasFlag(wxTB_HORIZONTAL) || HasFlag(wxTB_BOTTOM))
+                if (HasFlag(wxTB_TOP) || HasFlag(wxTB_BOTTOM))

                     nHeight = pTool->GetHeight() - 2;
                 else
                 {
                     nHeight = pTool->GetHeight() - 2;
                 else
                 {


@@ -973,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
 
 // ----------------------------------------------------------------------------


@@ -1165,7 +1171,7 @@ void wxToolBar::RaiseTool ( wxToolBarToolBase* pToolBase,
 
 void wxToolBar::OnTimer ( wxTimerEvent& rEvent )
 {
 
 void wxToolBar::OnTimer ( wxTimerEvent& rEvent )
 {

-    if (rEvent.GetId() == m_vToolTimer.GetTimerId())
+    if (rEvent.GetId() == m_vToolTimer.GetId())

     {
         wxPoint vPos( m_vXMouse, m_vYMouse );
 
     {
         wxPoint vPos( m_vXMouse, m_vYMouse );
 


@@ -1173,7 +1179,7 @@ void wxToolBar::OnTimer ( wxTimerEvent& rEvent )
         m_vToolTimer.Stop();
         m_vToolExpTimer.Start(4000L, TRUE);
     }
         m_vToolTimer.Stop();
         m_vToolExpTimer.Start(4000L, TRUE);
     }

-    else if (rEvent.GetId() == m_vToolExpTimer.GetTimerId())
+    else if (rEvent.GetId() == m_vToolExpTimer.GetId())

     {
         m_pToolTip->HideToolTipWindow();
         GetParent()->Refresh();
     {
         m_pToolTip->HideToolTipWindow();
         GetParent()->Refresh();