Added middle mouse event macros to wxListCtrl doc; added wxCreateGreyedImage

and attempt to show disabled buttons in wxUniversal wxToolBar


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/tbarbase.cpp

@@ -35,6 +35,8 @@
 #endif
 
 #include "wx/frame.h"
+#include "wx/image.h"
+#include "wx/settings.h"
 
 // For ::UpdateWindow
 #ifdef __WXMSW__
@@ -568,4 +570,119 @@ void wxToolBarBase::DoToolbarUpdates()
     }
 }
 
+///////////// button-label rendering helpers //////////////////
+
+#define MIN_COLOR_DIFF 10
+
+#define IS_IN_ARRAY(x,y) ( (x) < width && (y) < height && (x) >= 0 && (y) >= 0 )
+
+#define IS_GREATER(red1,green1,blue1, red2,green2,blue2) ( ( red1 > red2 + MIN_COLOR_DIFF ) && \
+                                ( green1 > green2 + MIN_COLOR_DIFF ) &&  \
+                                ( blue1 > blue2 + MIN_COLOR_DIFF )     \
+                              )
+
+// Helper function, used by wxCreateGreyedImage
+
+static void wxGreyOutImage( const wxImage& src, wxImage& dest,
+    const wxColour& darkCol, const wxColour& lightCol, const wxColour& bgCol)
+{
+    int x = 0;
+    int y = 1;
+
+    int width = src.GetWidth();
+    int height = src.GetHeight();
+
+    unsigned int redCur, greenCur, blueCur;
+
+    do
+    {
+        redCur = src.GetRed(x, y);
+        greenCur = src.GetGreen(x, y);
+        blueCur = src.GetBlue(x, y);     
+
+        if ( IS_IN_ARRAY(x-1,y-1) )
+        {
+            unsigned int redUpper = src.GetRed(x-1, y-1);
+            unsigned int greenUpper = src.GetGreen(x-1, y-1);
+            unsigned int blueUpper = src.GetBlue(x-1, y-1);     
+
+            // if the upper element is lighter than current
+            if ( IS_GREATER(redUpper, greenUpper, blueUpper, redCur, greenCur, blueCur) )
+            {
+                dest.SetRGB(x,y, darkCol.Red(), darkCol.Green(), darkCol.Blue());
+            }
+            // if the current element is ligher than the upper
+            else if ( IS_GREATER(redCur, greenCur, blueCur, redUpper, greenUpper, blueUpper) )
+            {
+                dest.SetRGB(x,y, lightCol.Red(), lightCol.Green(), lightCol.Blue());
+            }
+            else
+            {
+                unsigned int red1 = dest.GetRed(x-1, y-1);
+                unsigned int green1 = dest.GetGreen(x-1, y-1);
+                unsigned int blue1 = dest.GetBlue(x-1, y-1);     
+
+                if ( red1 == lightCol.Red() && green1 == lightCol.Green() && blue1 == lightCol.Blue() )
+                    dest.SetRGB(x, y, bgCol.Red(), bgCol.Green(), bgCol.Blue());
+                else if ( red1 == darkCol.Red() && green1 == darkCol.Green() && blue1 == darkCol.Blue() )
+                    dest.SetRGB(x, y, darkCol.Red(), darkCol.Green(), darkCol.Blue());
+                else
+                    dest.SetRGB(x, y, bgCol.Red(), bgCol.Green(), bgCol.Blue());
+            }
+        }
+
+        // go zig-zag
+
+        if ( IS_IN_ARRAY(x+1,y-1) ) 
+        {
+            ++x;
+            --y;
+        }
+        else
+        {
+            while ( IS_IN_ARRAY(x-1,y+1) ) 
+            {
+                --x;
+                ++y;
+            }
+
+            if ( IS_IN_ARRAY(x,y+1) )
+            {
+                ++y;
+                continue;
+            }
+            else
+            {
+                if ( IS_IN_ARRAY(x+1,y) )
+                {
+                    ++x;
+                    continue;
+                }
+                else break;
+            }
+        }
+
+    } while (1);
+}
+
+/*
+ * Make a greyed-out image suitable for disabled buttons.
+ * This code is adapted from wxNewBitmapButton in FL.
+ */
+
+bool wxCreateGreyedImage(const wxImage& in, wxImage& out)
+{
+    out = in.Copy();
+
+    // assuming the pixels along the edges are of the background color
+    wxColour bgCol(in.GetRed(0, 0), in.GetGreen(0, 0), in.GetBlue(0, 0));
+
+    wxColour darkCol = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW) ;
+    wxColour lightCol = wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT) ;
+
+    wxGreyOutImage(in, out, darkCol, lightCol, bgCol);
+
+    return TRUE;
+}
+
 #endif // wxUSE_TOOLBAR