added notebook.cpp and tabmdi.cpp

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

diff --git a/src/os2/toolbar.cpp b/src/os2/toolbar.cpp
index ea8d5f8480b4421105eab0ffdb2daac8db377319..482109880eb3bdc52eeb050c91a36b7d72c7f9f6 100644 (file)
--- a/src/os2/toolbar.cpp
+++ b/src/os2/toolbar.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        toolbar.cpp
+// Name:        src/os2/toolbar.cpp

 // Purpose:     wxToolBar
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxToolBar
 // Author:      David Webster
 // Modified by:


@@ -14,6 +14,8 @@
 
 #if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE
 
 
 #if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE
 

+#include "wx/toolbar.h"
+

 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/window.h"
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/window.h"


@@ -24,9 +26,8 @@
 #endif
 
 #include "wx/tooltip.h"
 #endif
 
 #include "wx/tooltip.h"

-#include "wx/toolbar.h"

 
 

-bool                                wxToolBar::m_bInitialized = FALSE;
+bool wxToolBar::m_bInitialized = false;

 
 // ----------------------------------------------------------------------------
 // private classes
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -275,12 +276,10 @@ wxToolBarToolBase* wxToolBar::InsertTool(
     return pTool;
 } // end of wxToolBar::InsertTool
 
     return pTool;
 } // end of wxToolBar::InsertTool
 

-bool wxToolBar::DoInsertTool(
-  size_t                            WXUNUSED(nPos)
-, wxToolBarToolBase*                pToolBase
-)
+bool wxToolBar::DoInsertTool( size_t WXUNUSED(nPos),
+                              wxToolBarToolBase* pToolBase )

 {
 {

-    wxToolBarTool*                  pTool = (wxToolBarTool *)pToolBase;
+    wxToolBarTool* pTool = (wxToolBarTool *)pToolBase;

 
     pTool->m_vX = m_vXPos;
     if (pTool->m_vX == -1)
 
     pTool->m_vX = m_vXPos;
     if (pTool->m_vX == -1)


@@ -303,27 +302,23 @@ bool wxToolBar::DoInsertTool(
         if ((pTool->m_vY + pTool->GetNormalBitmap().GetHeight() + m_yMargin) > m_vMaxHeight)
             m_vMaxHeight = (wxCoord)((pTool->m_vY + pTool->GetHeight() + m_yMargin));
     }
         if ((pTool->m_vY + pTool->GetNormalBitmap().GetHeight() + m_yMargin) > m_vMaxHeight)
             m_vMaxHeight = (wxCoord)((pTool->m_vY + pTool->GetHeight() + m_yMargin));
     }

-    return TRUE;
+    return true;

 } // end of wxToolBar::DoInsertTool
 
 } // end of wxToolBar::DoInsertTool
 

-bool wxToolBar::DoDeleteTool(
-  size_t                            WXUNUSED(nPos)
-, wxToolBarToolBase*                pTool
-)
+bool wxToolBar::DoDeleteTool( size_t WXUNUSED(nPos),
+                              wxToolBarToolBase* pTool )

 {
     pTool->Detach();
     Refresh();
 {
     pTool->Detach();
     Refresh();

-    return TRUE;
+    return true;

 } // end of wxToolBar::DoDeleteTool
 
 } // end of wxToolBar::DoDeleteTool
 

-bool wxToolBar::Create(
-  wxWindow*                         pParent
-, wxWindowID                        vId
-, const wxPoint&                    rPos
-, const wxSize&                     rSize
-, long                              lStyle
-, const wxString&                   rsName
-)
+bool wxToolBar::Create( wxWindow* pParent,
+                        wxWindowID vId,
+                        const wxPoint& rPos,
+                        const wxSize& rSize,
+                        long lStyle,
+                        const wxString& rsName )

 {
     if ( !wxWindow::Create( pParent
                            ,vId
 {
     if ( !wxWindow::Create( pParent
                            ,vId


@@ -332,7 +327,7 @@ bool wxToolBar::Create(
                            ,lStyle
                            ,rsName
                           ))
                            ,lStyle
                            ,rsName
                           ))

-        return FALSE;
+        return false;

 
     // Set it to grey (or other 3D face colour)
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
 
     // Set it to grey (or other 3D face colour)
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));


@@ -418,7 +413,7 @@ bool wxToolBar::Create(
             ,nWidth
             ,nHeight
            );
             ,nWidth
             ,nHeight
            );

-    return TRUE;
+    return true;

 } // end of wxToolBar::Create
 
 wxToolBar::~wxToolBar()
 } // end of wxToolBar::Create
 
 wxToolBar::~wxToolBar()


@@ -577,8 +572,8 @@ bool wxToolBar::Realize()
 
     m_maxWidth += m_xMargin;
     m_maxHeight += m_yMargin;
 
     m_maxWidth += m_xMargin;
     m_maxHeight += m_yMargin;

-    m_bInitialized = TRUE;
-    return TRUE;
+    m_bInitialized = true;
+    return true;

 } // end of wxToolBar::Realize
 
 // ----------------------------------------------------------------------------
 } // end of wxToolBar::Realize
 
 // ----------------------------------------------------------------------------


@@ -716,9 +711,7 @@ void wxToolBar::OnMouseEvent(
             pTool = (wxToolBarTool *)FindById(m_nCurrentTool);
             if (pTool && !pTool->IsToggled())
             {
             pTool = (wxToolBarTool *)FindById(m_nCurrentTool);
             if (pTool && !pTool->IsToggled())
             {

-                RaiseTool( pTool
-                          ,FALSE
-                         );
+                RaiseTool( pTool, FALSE );

             }
             m_nCurrentTool = -1;
             OnMouseEnter(-1);
             }
             m_nCurrentTool = -1;
             OnMouseEnter(-1);


@@ -745,9 +738,7 @@ void wxToolBar::OnMouseEvent(
             wxToolBarTool*          pOldTool = (wxToolBarTool*)FindById(m_nCurrentTool);
 
             if (pOldTool && !pTool->IsToggled())
             wxToolBarTool*          pOldTool = (wxToolBarTool*)FindById(m_nCurrentTool);
 
             if (pOldTool && !pTool->IsToggled())

-                RaiseTool( pOldTool
-                          ,FALSE
-                         );
+                RaiseTool( pOldTool, FALSE );

             m_nCurrentTool = pTool->GetId();
             OnMouseEnter(m_nCurrentTool);
             if (!pTool->GetShortHelp().empty())
             m_nCurrentTool = pTool->GetId();
             OnMouseEnter(m_nCurrentTool);
             if (!pTool->GetShortHelp().empty())


@@ -810,27 +801,20 @@ void wxToolBar::OnMouseEvent(
 // drawing
 // ----------------------------------------------------------------------------
 
 // drawing
 // ----------------------------------------------------------------------------
 

-void wxToolBar::DrawTool(
-  wxToolBarToolBase*                pTool
-)
+void wxToolBar::DrawTool( wxToolBarToolBase* pTool )

 {
 {

-    wxClientDC                      vDc(this);
+    wxClientDC vDc(this);

 
 

-    DrawTool( vDc
-             ,pTool
-            );
+    DrawTool( vDc, pTool );

 } // end of wxToolBar::DrawTool
 
 } // end of wxToolBar::DrawTool
 

-void wxToolBar::DrawTool(
-  wxDC&                             rDc
-, wxToolBarToolBase*                pToolBase
-)
+void wxToolBar::DrawTool( wxDC& rDc, wxToolBarToolBase* pToolBase )

 {
     wxToolBarTool* pTool = (wxToolBarTool *)pToolBase;
     wxColour gray85( 85,85,85 );
     wxPen vDarkGreyPen( gray85, 1, wxSOLID );
     wxBitmap vBitmap = pTool->GetNormalBitmap();
 {
     wxToolBarTool* pTool = (wxToolBarTool *)pToolBase;
     wxColour gray85( 85,85,85 );
     wxPen vDarkGreyPen( gray85, 1, wxSOLID );
     wxBitmap vBitmap = pTool->GetNormalBitmap();

-    bool bUseMask = FALSE;
+    bool bUseMask = false;

     wxMask* pMask = NULL;
 
     PrepareDC(rDc);
     wxMask* pMask = NULL;
 
     PrepareDC(rDc);


@@ -839,7 +823,7 @@ void wxToolBar::DrawTool(
         return;
     if ((pMask = vBitmap.GetMask()) != NULL)
         if (pMask->GetMaskBitmap() != NULLHANDLE)
         return;
     if ((pMask = vBitmap.GetMask()) != NULL)
         if (pMask->GetMaskBitmap() != NULLHANDLE)

-            bUseMask = TRUE;
+            bUseMask = true;

 
     if (!pTool->IsToggled())
     {
 
     if (!pTool->IsToggled())
     {


@@ -889,7 +873,7 @@ void wxToolBar::DrawTool(
                 GetSize(&vX, &vY);
                 rDc.DrawText( pTool->GetLabel()
                              ,vLeft
                 GetSize(&vX, &vY);
                 rDc.DrawText( pTool->GetLabel()
                              ,vLeft

-                             ,vY - (m_vTextY - 2)
+                             ,vY - m_vTextY - 1

                             );
             }
             else  // normal tools
                             );
             }
             else  // normal tools


@@ -897,7 +881,7 @@ void wxToolBar::DrawTool(
                 vLeft += (wxCoord)((m_vTextX - vX)/2);
                 rDc.DrawText( pTool->GetLabel()
                              ,vLeft
                 vLeft += (wxCoord)((m_vTextX - vX)/2);
                 rDc.DrawText( pTool->GetLabel()
                              ,vLeft

-                             ,pTool->m_vY + m_vTextY + 4 // a bit of margin
+                             ,pTool->m_vY + m_vTextY - 1 // a bit of margin

                             );
             }
         }
                             );
             }
         }


@@ -931,7 +915,7 @@ void wxToolBar::DrawTool(
             vLeft += (wxCoord)((m_vTextX - vX)/2);
             rDc.DrawText( pTool->GetLabel()
                          ,vLeft
             vLeft += (wxCoord)((m_vTextX - vX)/2);
             rDc.DrawText( pTool->GetLabel()
                          ,vLeft

-                         ,pTool->m_vY + m_vTextY + 4 // a bit of margin
+                         ,pTool->m_vY + m_vTextY - 1 // a bit of margin

                         );
         }
     }
                         );
         }
     }


@@ -1179,15 +1163,11 @@ void wxToolBar::RaiseTool ( wxToolBarToolBase* pToolBase,
     }
 } // end of wxToolBar::RaiseTool
 
     }
 } // end of wxToolBar::RaiseTool
 

-void wxToolBar::OnTimer (
-  wxTimerEvent&                     rEvent
-)
+void wxToolBar::OnTimer ( wxTimerEvent& rEvent )

 {
     if (rEvent.GetId() == m_vToolTimer.GetTimerId())
     {
 {
     if (rEvent.GetId() == m_vToolTimer.GetTimerId())
     {

-        wxPoint                     vPos( m_vXMouse
-                                         ,m_vYMouse
-                                        );
+        wxPoint vPos( m_vXMouse, m_vYMouse );

 
         m_pToolTip->DisplayToolTipWindow(vPos);
         m_vToolTimer.Stop();
 
         m_pToolTip->DisplayToolTipWindow(vPos);
         m_vToolTimer.Stop();