cleanup - more reformatting; fixed bug introduced in prior commit

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

diff --git a/src/os2/toolbar.cpp b/src/os2/toolbar.cpp
index 82dd46c560bf6b6d7d4c365519254c2e19a0b067..ea8d5f8480b4421105eab0ffdb2daac8db377319 100644 (file)
--- a/src/os2/toolbar.cpp
+++ b/src/os2/toolbar.cpp
@@ -366,7 +366,7 @@ bool wxToolBar::Create(
         wxClientDC                  vDC(this);
 
         vDC.SetFont(GetFont());
         wxClientDC                  vDC(this);
 
         vDC.SetFont(GetFont());

-        vDC.GetTextExtent( "XXXX"
+        vDC.GetTextExtent( wxT("XXXX")

                           ,&m_vTextX
                           ,&m_vTextY
                          );
                           ,&m_vTextX
                           ,&m_vTextY
                          );


@@ -445,13 +445,13 @@ bool wxToolBar::Realize()
     //
     // Find the maximum tool width and height
     //
     //
     // Find the maximum tool width and height
     //

-    wxToolBarToolsList::Node*       pNode = m_tools.GetFirst();
+    wxToolBarToolsList::compatibility_iterator     node = m_tools.GetFirst();

 
 

-    while (pNode )
+    while (node )

     {
     {

-        wxToolBarTool*              pTool = (wxToolBarTool *)pNode->GetData();
+        wxToolBarTool*              pTool = (wxToolBarTool *)node->GetData();

 
 

-        if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().IsEmpty())
+        if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().empty())

         {
             //
             // Set the height according to the font and the border size
         {
             //
             // Set the height according to the font and the border size


@@ -470,7 +470,7 @@ bool wxToolBar::Realize()
             if (pTool->GetHeight() > nMaxToolHeight)
                 nMaxToolHeight = pTool->GetHeight();
         }
             if (pTool->GetHeight() > nMaxToolHeight)
                 nMaxToolHeight = pTool->GetHeight();
         }

-        pNode = pNode->GetNext();
+        node = node->GetNext();

     }
 
     wxCoord                         vTbWidth = 0L;
     }
 
     wxCoord                         vTbWidth = 0L;


@@ -497,10 +497,10 @@ bool wxToolBar::Realize()
 
     int                             nSeparatorSize = m_toolSeparation;
 
 
     int                             nSeparatorSize = m_toolSeparation;
 

-    pNode = m_tools.GetFirst();
-    while (pNode)
+    node = m_tools.GetFirst();
+    while (node)

     {
     {

-        wxToolBarTool*              pTool = (wxToolBarTool *)pNode->GetData();
+        wxToolBarTool*              pTool = (wxToolBarTool *)node->GetData();

 
         if (pTool->IsSeparator())
         {
 
         if (pTool->IsSeparator())
         {


@@ -567,7 +567,7 @@ bool wxToolBar::Realize()
         if (m_vLastY > m_maxHeight)
             m_maxHeight = m_vLastY;
 
         if (m_vLastY > m_maxHeight)
             m_maxHeight = m_vLastY;
 

-        pNode = pNode->GetNext();
+        node = node->GetNext();

     }
 
     if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
     }
 
     if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )


@@ -603,24 +603,22 @@ void wxToolBar::OnPaint (
     nCount++;
 
     ::WinFillRect(vDc.GetHPS(), &vDc.m_vRclPaint, GetBackgroundColour().GetPixel());
     nCount++;
 
     ::WinFillRect(vDc.GetHPS(), &vDc.m_vRclPaint, GetBackgroundColour().GetPixel());

-    for ( wxToolBarToolsList::Node* pNode = m_tools.GetFirst();
-          pNode;
-          pNode = pNode->GetNext() )
+    for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
+          node;
+          node = node->GetNext() )

     {
     {

-        wxToolBarTool*              pTool = (wxToolBarTool*)pNode->GetData();
+        wxToolBarTool*              pTool = (wxToolBarTool*)node->GetData();

 
         if (pTool->IsButton() )
             DrawTool(vDc, pTool);
         if (pTool->IsSeparator())
         {
 
         if (pTool->IsButton() )
             DrawTool(vDc, pTool);
         if (pTool->IsSeparator())
         {

-            wxPen                   vDarkGreyPen( wxColour(85, 85, 85)
-                                                 ,1
-                                                 ,wxSOLID
-                                                );
-            int                     nX;
-            int                     nY;
-            int                     nHeight = 0;
-            int                     nWidth = 0;
+            wxColour gray85(85, 85, 85);
+            wxPen vDarkGreyPen( gray85, 1, wxSOLID );
+            int nX;
+            int nY;
+            int nHeight = 0;
+            int nWidth = 0;

 
             vDc.SetPen(vDarkGreyPen);
             if (HasFlag(wxTB_TEXT))
 
             vDc.SetPen(vDarkGreyPen);
             if (HasFlag(wxTB_TEXT))


@@ -752,7 +750,7 @@ void wxToolBar::OnMouseEvent(
                          );
             m_nCurrentTool = pTool->GetId();
             OnMouseEnter(m_nCurrentTool);
                          );
             m_nCurrentTool = pTool->GetId();
             OnMouseEnter(m_nCurrentTool);

-            if (!pTool->GetShortHelp().IsEmpty())
+            if (!pTool->GetShortHelp().empty())

             {
                 if (m_pToolTip)
                     delete m_pToolTip;
             {
                 if (m_pToolTip)
                     delete m_pToolTip;


@@ -828,22 +826,12 @@ void wxToolBar::DrawTool(
 , wxToolBarToolBase*                pToolBase
 )
 {
 , wxToolBarToolBase*                pToolBase
 )
 {

-    wxToolBarTool*                  pTool = (wxToolBarTool *)pToolBase;
-    wxPen                           vDarkGreyPen( wxColour( 85,85,85 )
-                                                 ,1
-                                                 ,wxSOLID
-                                                );
-    wxPen                           vWhitePen( wxT("WHITE")
-                                              ,1
-                                              ,wxSOLID
-                                             );
-    wxPen                           vBlackPen( wxT("BLACK")
-                                              ,1
-                                              ,wxSOLID
-                                             );
-    wxBitmap                        vBitmap = pTool->GetNormalBitmap();
-    bool                            bUseMask = FALSE;
-    wxMask*                         pMask = NULL;
+    wxToolBarTool* pTool = (wxToolBarTool *)pToolBase;
+    wxColour gray85( 85,85,85 );
+    wxPen vDarkGreyPen( gray85, 1, wxSOLID );
+    wxBitmap vBitmap = pTool->GetNormalBitmap();
+    bool bUseMask = FALSE;
+    wxMask* pMask = NULL;

 
     PrepareDC(rDc);
 
 
     PrepareDC(rDc);
 


@@ -858,7 +846,7 @@ void wxToolBar::DrawTool(
         LowerTool(pTool, FALSE);
         if (!pTool->IsEnabled())
         {
         LowerTool(pTool, FALSE);
         if (!pTool->IsEnabled())
         {

-            wxColour                vColor("GREY");
+            wxColour vColor(wxT("GREY"));

 
             rDc.SetTextForeground(vColor);
             if (!pTool->GetDisabledBitmap().Ok())
 
             rDc.SetTextForeground(vColor);
             if (!pTool->GetDisabledBitmap().Ok())


@@ -873,9 +861,7 @@ void wxToolBar::DrawTool(
         }
         else
         {
         }
         else
         {

-            wxColour                vColor("BLACK");
-
-            rDc.SetTextForeground(vColor);
+            rDc.SetTextForeground(*wxBLACK);

             rDc.DrawBitmap( vBitmap
                            ,pTool->m_vX
                            ,pTool->m_vY
             rDc.DrawBitmap( vBitmap
                            ,pTool->m_vX
                            ,pTool->m_vY


@@ -918,7 +904,7 @@ void wxToolBar::DrawTool(
     }
     else
     {
     }
     else
     {

-        wxColour                    vColor("GREY");
+        wxColour vColor(wxT("GREY"));

 
         LowerTool(pTool);
         rDc.SetTextForeground(vColor);
 
         LowerTool(pTool);
         rDc.SetTextForeground(vColor);


@@ -976,10 +962,10 @@ wxToolBarToolBase* wxToolBar::FindToolForPosition(
             ,&vTBarHeight
            );
     vY = vTBarHeight - vY;
             ,&vTBarHeight
            );
     vY = vTBarHeight - vY;

-    wxToolBarToolsList::Node* pNode = m_tools.GetFirst();
-    while (pNode)
+    wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
+    while (node)

     {
     {

-        wxToolBarTool*              pTool = (wxToolBarTool *)pNode->GetData();
+        wxToolBarTool*              pTool = (wxToolBarTool *)node->GetData();

 
         if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().IsNull())
         {
 
         if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().IsNull())
         {


@@ -1001,7 +987,7 @@ wxToolBarToolBase* wxToolBar::FindToolForPosition(
                 return pTool;
             }
         }
                 return pTool;
             }
         }

-        pNode = pNode->GetNext();
+        node = node->GetNext();

     }
     return (wxToolBarToolBase *)NULL;
 } // end of wxToolBar::FindToolForPosition
     }
     return (wxToolBarToolBase *)NULL;
 } // end of wxToolBar::FindToolForPosition


@@ -1058,29 +1044,18 @@ void wxToolBar::SpringUpButton(
 // private helpers
 // ----------------------------------------------------------------------------
 
 // private helpers
 // ----------------------------------------------------------------------------
 

-void wxToolBar::LowerTool (
-  wxToolBarToolBase*                pToolBase
-, bool                              bLower
-)
+void wxToolBar::LowerTool ( wxToolBarToolBase* pToolBase,
+                            bool               bLower )

 {
     wxToolBarTool*                  pTool = (wxToolBarTool*)pToolBase;
 {
     wxToolBarTool*                  pTool = (wxToolBarTool*)pToolBase;

-    wxCoord                         vX;
-    wxCoord                         vY;
-    wxCoord                         vWidth;
-    wxCoord                         vHeight;
-    wxPen                           vDarkGreyPen( wxColour(85, 85, 85)
-                                                 ,1
-                                                 ,wxSOLID
-                                                );
-    wxPen                           vWhitePen( "WHITE"
-                                              ,1
-                                              ,wxSOLID
-                                             );
-    wxPen                           vClearPen( GetBackgroundColour()
-                                              ,1
-                                              ,wxSOLID
-                                             );
-    wxClientDC                      vDC(this);
+    wxCoord vX;
+    wxCoord vY;
+    wxCoord vWidth;
+    wxCoord vHeight;
+    wxColour gray85( 85,85,85 );
+    wxPen vDarkGreyPen( gray85, 1, wxSOLID );
+    wxPen vClearPen( GetBackgroundColour(), 1, wxSOLID );
+    wxClientDC vDC(this);

 
     if (!pTool)
         return;
 
     if (!pTool)
         return;


@@ -1094,7 +1069,7 @@ void wxToolBar::LowerTool (
     if (!HasFlag(wxTB_FLAT))
         return;
 
     if (!HasFlag(wxTB_FLAT))
         return;
 

-    if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().IsEmpty())
+    if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().empty())

     {
         if (pTool->GetWidth() > m_vTextX)
         {
     {
         if (pTool->GetWidth() > m_vTextX)
         {


@@ -1118,7 +1093,7 @@ void wxToolBar::LowerTool (
     }
     if (bLower)
     {
     }
     if (bLower)
     {

-        vDC.SetPen(vWhitePen);
+        vDC.SetPen(*wxWHITE_PEN);

         vDC.DrawLine(vX + vWidth, vY + vHeight, vX, vY + vHeight);
         vDC.DrawLine(vX + vWidth, vY, vX + vWidth, vY + vHeight);
         vDC.SetPen(vDarkGreyPen);
         vDC.DrawLine(vX + vWidth, vY + vHeight, vX, vY + vHeight);
         vDC.DrawLine(vX + vWidth, vY, vX + vWidth, vY + vHeight);
         vDC.SetPen(vDarkGreyPen);


@@ -1135,29 +1110,18 @@ void wxToolBar::LowerTool (
     }
 } // end of WinGuiBase_CToolBarTool::LowerTool
 
     }
 } // end of WinGuiBase_CToolBarTool::LowerTool
 

-void wxToolBar::RaiseTool (
-  wxToolBarToolBase*                pToolBase
-, bool                              bRaise
-)
+void wxToolBar::RaiseTool ( wxToolBarToolBase* pToolBase,
+                            bool bRaise )

 {
 {

-    wxToolBarTool*                  pTool = (wxToolBarTool*)pToolBase;
-    wxCoord                         vX;
-    wxCoord                         vY;
-    wxCoord                         vWidth;
-    wxCoord                         vHeight;
-    wxPen                           vDarkGreyPen( wxColour(85, 85, 85)
-                                                 ,1
-                                                 ,wxSOLID
-                                                );
-    wxPen                           vWhitePen( "WHITE"
-                                              ,1
-                                              ,wxSOLID
-                                             );
-    wxPen                           vClearPen( GetBackgroundColour()
-                                              ,1
-                                              ,wxSOLID
-                                             );
-    wxClientDC                      vDC(this);
+    wxToolBarTool* pTool = (wxToolBarTool*)pToolBase;
+    wxCoord vX;
+    wxCoord vY;
+    wxCoord vWidth;
+    wxCoord vHeight;
+    wxColour gray85( 85,85,85 );
+    wxPen vDarkGreyPen( gray85, 1, wxSOLID );
+    wxPen vClearPen( GetBackgroundColour(), 1, wxSOLID );
+    wxClientDC vDC(this);

 
     if (!pTool)
         return;
 
     if (!pTool)
         return;


@@ -1174,7 +1138,7 @@ void wxToolBar::RaiseTool (
     if (!HasFlag(wxTB_FLAT))
         return;
 
     if (!HasFlag(wxTB_FLAT))
         return;
 

-    if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().IsEmpty())
+    if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().empty())

     {
         if (pTool->GetWidth() > m_vTextX)
         {
     {
         if (pTool->GetWidth() > m_vTextX)
         {


@@ -1201,7 +1165,7 @@ void wxToolBar::RaiseTool (
         vDC.SetPen(vDarkGreyPen);
         vDC.DrawLine(vX + vWidth, vY + vHeight, vX, vY + vHeight);
         vDC.DrawLine(vX + vWidth, vY, vX + vWidth, vY + vHeight);
         vDC.SetPen(vDarkGreyPen);
         vDC.DrawLine(vX + vWidth, vY + vHeight, vX, vY + vHeight);
         vDC.DrawLine(vX + vWidth, vY, vX + vWidth, vY + vHeight);

-        vDC.SetPen(vWhitePen);
+        vDC.SetPen(*wxWHITE_PEN);

         vDC.DrawLine(vX, vY, vX + vWidth, vY);
         vDC.DrawLine(vX, vY + vHeight, vX, vY);
     }
         vDC.DrawLine(vX, vY, vX + vWidth, vY);
         vDC.DrawLine(vX, vY + vHeight, vX, vY);
     }