test program improvements (patch 927429)

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

diff --git a/src/os2/toolbar.cpp b/src/os2/toolbar.cpp
index 1d296bda352325ba9a4cd6ea23543287780b985f..82dd46c560bf6b6d7d4c365519254c2e19a0b067 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)


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


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


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

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

     wxCoord                         vTBarHeight = 0;
 
     GetSize( NULL
     wxCoord                         vTBarHeight = 0;
 
     GetSize( NULL