Include wx/font.h according to precompiled headers of wx/wx.h (with other minor clean...

[wxWidgets.git] / src / common / tbarbase.cpp

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index edfff6c1f204c334029c6bb870c466e01067983a..54878f1ebdf6722042fbe26771c4762dd6223877 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -1,8 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        common/tbarbase.cpp
+// Name:        src/common/tbarbase.cpp

 // Purpose:     wxToolBarBase implementation
 // Author:      Julian Smart
 // Purpose:     wxToolBarBase implementation
 // Author:      Julian Smart

-// Modified by: VZ at 11.12.99 (wxScrollableToolBar splitted off)
+// Modified by: VZ at 11.12.99 (wxScrollableToolBar split off)

 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "tbarbase.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -30,15 +26,17 @@
 
 #if wxUSE_TOOLBAR
 
 
 #if wxUSE_TOOLBAR
 

+#include "wx/toolbar.h"
+

 #ifndef WX_PRECOMP
     #include "wx/control.h"
 #ifndef WX_PRECOMP
     #include "wx/control.h"

+    #include "wx/frame.h"
+    #include "wx/settings.h"

 #endif
 
 #endif
 

-#include "wx/frame.h"
-#include "wx/image.h"
-#include "wx/settings.h"
-
-#include "wx/toolbar.h"
+#if wxUSE_IMAGE
+    #include "wx/image.h"
+#endif // wxUSE_IMAGE

 
 // ----------------------------------------------------------------------------
 // wxWidgets macros
 
 // ----------------------------------------------------------------------------
 // wxWidgets macros


@@ -49,7 +47,7 @@ END_EVENT_TABLE()
 
 #include "wx/listimpl.cpp"
 
 
 #include "wx/listimpl.cpp"
 

-WX_DEFINE_LIST(wxToolBarToolsList);
+WX_DEFINE_LIST(wxToolBarToolsList)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -114,30 +112,6 @@ bool wxToolBarToolBase::SetLongHelp(const wxString& help)
     return true;
 }
 
     return true;
 }
 

-#if WXWIN_COMPATIBILITY_2_2
-
-const wxBitmap& wxToolBarToolBase::GetBitmap1() const
-{
-    return GetNormalBitmap();
-}
-
-const wxBitmap& wxToolBarToolBase::GetBitmap2() const
-{
-    return GetDisabledBitmap();
-}
-
-void wxToolBarToolBase::SetBitmap1(const wxBitmap& bmp)
-{
-    SetNormalBitmap(bmp);
-}
-
-void wxToolBarToolBase::SetBitmap2(const wxBitmap& bmp)
-{
-    SetDisabledBitmap(bmp);
-}
-
-#endif // WXWIN_COMPATIBILITY_2_2
-

 // ----------------------------------------------------------------------------
 // wxToolBarBase adding/deleting items
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxToolBarBase adding/deleting items
 // ----------------------------------------------------------------------------


@@ -402,14 +376,14 @@ void wxToolBarBase::UnToggleRadioGroup(wxToolBarToolBase *tool)
     wxToolBarToolsList::compatibility_iterator nodeNext = node->GetNext();
     while ( nodeNext )
     {
     wxToolBarToolsList::compatibility_iterator nodeNext = node->GetNext();
     while ( nodeNext )
     {

-        wxToolBarToolBase *tool = nodeNext->GetData();
+        wxToolBarToolBase *toolNext = nodeNext->GetData();

 
 

-        if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
+        if ( !toolNext->IsButton() || toolNext->GetKind() != wxITEM_RADIO )

             break;
 
             break;
 

-        if ( tool->Toggle(false) )
+        if ( toolNext->Toggle(false) )

         {
         {

-            DoToggleTool(tool, false);
+            DoToggleTool(toolNext, false);

         }
 
         nodeNext = nodeNext->GetNext();
         }
 
         nodeNext = nodeNext->GetNext();


@@ -418,14 +392,14 @@ void wxToolBarBase::UnToggleRadioGroup(wxToolBarToolBase *tool)
     wxToolBarToolsList::compatibility_iterator nodePrev = node->GetPrevious();
     while ( nodePrev )
     {
     wxToolBarToolsList::compatibility_iterator nodePrev = node->GetPrevious();
     while ( nodePrev )
     {

-        wxToolBarToolBase *tool = nodePrev->GetData();
+        wxToolBarToolBase *toolNext = nodePrev->GetData();

 
 

-        if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
+        if ( !toolNext->IsButton() || toolNext->GetKind() != wxITEM_RADIO )

             break;
 
             break;
 

-        if ( tool->Toggle(false) )
+        if ( toolNext->Toggle(false) )

         {
         {

-            DoToggleTool(tool, false);
+            DoToggleTool(toolNext, false);

         }
 
         nodePrev = nodePrev->GetPrevious();
         }
 
         nodePrev = nodePrev->GetPrevious();


@@ -434,7 +408,10 @@ void wxToolBarBase::UnToggleRadioGroup(wxToolBarToolBase *tool)
 
 void wxToolBarBase::ClearTools()
 {
 
 void wxToolBarBase::ClearTools()
 {

-    WX_CLEAR_LIST(wxToolBarToolsList, m_tools);
+    while ( GetToolsCount() )
+    {
+        DeleteToolByPos(0);
+    }

 }
 
 bool wxToolBarBase::Realize()
 }
 
 bool wxToolBarBase::Realize()


@@ -448,7 +425,7 @@ wxToolBarBase::~wxToolBarBase()
 
     // notify the frame that it doesn't have a tool bar any longer to avoid
     // dangling pointers
 
     // notify the frame that it doesn't have a tool bar any longer to avoid
     // dangling pointers

-    wxFrameBase *frame = wxDynamicCast(GetParent(), wxFrameBase);
+    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);

     if ( frame && frame->GetToolBar() == this )
     {
         frame->SetToolBar(NULL);
     if ( frame && frame->GetToolBar() == this )
     {
         frame->SetToolBar(NULL);


@@ -691,75 +668,73 @@ void wxToolBarBase::UpdateWindowUI(long flags)
     }
 }
 
     }
 }
 

-// Helper function, used by wxCreateGreyedImage
-
-static void wxGreyOutImage( const wxImage& src,
-                            wxImage& dest,
-                            const wxColour& darkCol,
-                            const wxColour& lightCol,
-                            const wxColour& bgCol )
-{
-    // Second attempt, just making things monochrome
-    int width = src.GetWidth();
-    int height = src.GetHeight();
-
-    int redCur, greenCur, blueCur;
-    for ( int x = 0; x < width; x++ )
-    {
-        for ( int y = 1; y < height; y++ )
-        {
-            redCur = src.GetRed(x, y);
-            greenCur = src.GetGreen(x, y);
-            blueCur = src.GetBlue(x, y);
-
-            // Change light things to the background colour
-            if ( redCur >= (lightCol.Red() - 50) && greenCur >= (lightCol.Green() - 50) && blueCur >= (lightCol.Blue() - 50) )
-            {
-                dest.SetRGB(x,y, bgCol.Red(), bgCol.Green(), bgCol.Blue());
-            }
-            else if ( redCur == bgCol.Red() && greenCur == bgCol.Green() && blueCur == bgCol.Blue() )
-            {
-                // Leave the background colour as-is
-                // dest.SetRGB(x,y, bgCol.Red(), bgCol.Green(), bgCol.Blue());
-            }
-            else // if ( redCur <= darkCol.Red() && greenCur <= darkCol.Green() && blueCur <= darkCol.Blue() )
-            {
-                // Change dark things to really dark
-                dest.SetRGB(x,y, darkCol.Red(), darkCol.Green(), darkCol.Blue());
-            }
-        }
-    }
-}
+#if wxUSE_IMAGE

 
 /*
  * Make a greyed-out image suitable for disabled buttons.
  * This code is adapted from wxNewBitmapButton in FL.
  */
 
 
 /*
  * Make a greyed-out image suitable for disabled buttons.
  * This code is adapted from wxNewBitmapButton in FL.
  */
 

-bool wxCreateGreyedImage(const wxImage& in, wxImage& out)
+bool wxCreateGreyedImage(const wxImage& src, wxImage& dst)

 {
 {

-    out = in.Copy();
+    dst = src.Copy();

 
 

-    unsigned char r, g, b;
-    if ( in.HasMask() )
+    unsigned char rBg, gBg, bBg;
+    if ( src.HasMask() )

     {
     {

-        in.GetOrFindMaskColour(&r, &g, &b);
+        src.GetOrFindMaskColour(&rBg, &gBg, &bBg);
+        dst.SetMaskColour(rBg, gBg, bBg);

     }
     else // assuming the pixels along the edges are of the background color
     {
     }
     else // assuming the pixels along the edges are of the background color
     {

-        r = in.GetRed(0, 0);
-        g = in.GetGreen(0, 0);
-        b = in.GetBlue(0, 0);
+        rBg = src.GetRed(0, 0);
+        gBg = src.GetGreen(0, 0);
+        bBg = src.GetBlue(0, 0);

     }
 
     }
 

-    wxColour bgCol(r, g, b);
+    const wxColour colBg(rBg, gBg, bBg);

 
 

-    wxColour darkCol = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW) ;
-    wxColour lightCol = wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT) ;
+    const wxColour colDark = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW);
+    const wxColour colLight = wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT);

 
 

-    wxGreyOutImage(in, out, darkCol, lightCol, bgCol);
+    // Second attempt, just making things monochrome
+    const int width = src.GetWidth();
+    const int height = src.GetHeight();
+
+    for ( int x = 0; x < width; x++ )
+    {
+        for ( int y = 0; y < height; y++ )
+        {
+            const int r = src.GetRed(x, y);
+            const int g = src.GetGreen(x, y);
+            const int b = src.GetBlue(x, y);
+
+            if ( r == rBg && g == gBg && b == bBg )
+            {
+                // Leave the background colour as-is
+                continue;
+            }
+
+            // Change light things to the background colour
+            wxColour col;
+            if ( r >= (colLight.Red() - 50) &&
+                    g >= (colLight.Green() - 50) &&
+                        b >= (colLight.Blue() - 50) )
+            {
+                col = colBg;
+            }
+            else // Change dark things to really dark
+            {
+                col = colDark;
+            }
+
+            dst.SetRGB(x, y, col.Red(), col.Green(), col.Blue());
+        }
+    }

 
     return true;
 }
 
 
     return true;
 }
 

+#endif // wxUSE_IMAGE
+

 #endif // wxUSE_TOOLBAR
 #endif // wxUSE_TOOLBAR