Test for x, y in GetPosition

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

diff --git a/src/os2/toolbar.cpp b/src/os2/toolbar.cpp
index 1d296bda352325ba9a4cd6ea23543287780b985f..def07d219204641cfa5ee8247d0eb7b72b3c3672 100644 (file)
--- a/src/os2/toolbar.cpp
+++ b/src/os2/toolbar.cpp
@@ -84,7 +84,7 @@ public:
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // wxWin macros
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)

 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
     EVT_SIZE(wxToolBar::OnSize)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
     EVT_SIZE(wxToolBar::OnSize)


@@ -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
                          );


@@ -379,7 +379,6 @@ bool wxToolBar::Create(
     int                             nY      = rPos.y;
     int                             nWidth  = rSize.x;
     int                             nHeight = rSize.y;
     int                             nY      = rPos.y;
     int                             nWidth  = rSize.x;
     int                             nHeight = rSize.y;

-    wxFrame*                        pFrame = wxDynamicCast(GetParent(), wxFrame);

 
     if (lStyle & wxTB_HORIZONTAL)
     {
 
     if (lStyle & wxTB_HORIZONTAL)
     {


@@ -435,8 +434,6 @@ bool wxToolBar::Realize()
 {
     int                             nMaxToolWidth  = 0;
     int                             nMaxToolHeight = 0;
 {
     int                             nMaxToolWidth  = 0;
     int                             nMaxToolHeight = 0;

-    int                             nX;
-    int                             nY;

 
     m_nCurrentRowsOrColumns = 0;
     m_vLastX               = m_xMargin;
 
     m_nCurrentRowsOrColumns = 0;
     m_vLastX               = m_xMargin;


@@ -448,11 +445,11 @@ 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().IsEmpty())
         {


@@ -473,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;


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


@@ -570,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 )


@@ -606,11 +603,11 @@ 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->IsButton() )
             DrawTool(vDc, pTool);


@@ -847,7 +844,6 @@ void wxToolBar::DrawTool(
     wxBitmap                        vBitmap = pTool->GetNormalBitmap();
     bool                            bUseMask = FALSE;
     wxMask*                         pMask = NULL;
     wxBitmap                        vBitmap = pTool->GetNormalBitmap();
     bool                            bUseMask = FALSE;
     wxMask*                         pMask = NULL;

-    RECTL                           vRect;

 
     PrepareDC(rDc);
 
 
     PrepareDC(rDc);
 


@@ -862,7 +858,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())


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

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

 
             rDc.SetTextForeground(vColor);
             rDc.DrawBitmap( vBitmap
 
             rDc.SetTextForeground(vColor);
             rDc.DrawBitmap( vBitmap


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

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

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


@@ -974,18 +970,16 @@ wxToolBarToolBase* wxToolBar::FindToolForPosition(
 , wxCoord                           vY
 ) const
 {
 , wxCoord                           vY
 ) const
 {

-    wxCoord                         vTextX = 0;
-    wxCoord                         vTextY = 0;

     wxCoord                         vTBarHeight = 0;
 
     GetSize( NULL
             ,&vTBarHeight
            );
     vY = vTBarHeight - vY;
     wxCoord                         vTBarHeight = 0;
 
     GetSize( NULL
             ,&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())
         {


@@ -1007,7 +1001,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


@@ -1078,7 +1072,7 @@ void wxToolBar::LowerTool (
                                                  ,1
                                                  ,wxSOLID
                                                 );
                                                  ,1
                                                  ,wxSOLID
                                                 );

-    wxPen                           vWhitePen( "WHITE"
+    wxPen                           vWhitePen( wxT("WHITE")

                                               ,1
                                               ,wxSOLID
                                              );
                                               ,1
                                               ,wxSOLID
                                              );


@@ -1155,7 +1149,7 @@ void wxToolBar::RaiseTool (
                                                  ,1
                                                  ,wxSOLID
                                                 );
                                                  ,1
                                                  ,wxSOLID
                                                 );

-    wxPen                           vWhitePen( "WHITE"
+    wxPen                           vWhitePen( wxT("WHITE")

                                               ,1
                                               ,wxSOLID
                                              );
                                               ,1
                                               ,wxSOLID
                                              );