wxCreateGreyedImage() deprecated, use wxImage::ConvertToGreyscale() directly instead

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

diff --git a/docs/changes.txt b/docs/changes.txt
index a3b8d3dc9e0b2b6a6eb0632c0ab5773cc104d745..b2581d0ab0b93802fded8ddbf919cde330df1078 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -14,6 +14,8 @@ Changes in behaviour which may result in compilation errors
 Deprecated methods and their replacements
 -----------------------------------------
 
 Deprecated methods and their replacements
 -----------------------------------------
 

+- wxCreateGreyedImage() deprecated, use wxImage::ConvertToGreyscale() instead
+

 Major new features in this release
 ----------------------------------
 
 Major new features in this release
 ----------------------------------
 

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index b9febfbc3e2522bc7c5e98211178768bd0e5c5d9..9f0f42fa4f29b0ab5cf2fc51d45c2dfae998a4dd 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -603,8 +603,14 @@ private:
     DECLARE_NO_COPY_CLASS(wxToolBarBase)
 };
 
     DECLARE_NO_COPY_CLASS(wxToolBarBase)
 };
 

-// Helper function for creating the image for disabled buttons
-bool wxCreateGreyedImage(const wxImage& in, wxImage& out) ;
+// deprecated function for creating the image for disabled buttons, use
+// wxImage::ConvertToGreyscale() instead
+#if WXWIN_COMPATIBILITY_2_8
+
+wxDEPRECATED( bool wxCreateGreyedImage(const wxImage& in, wxImage& out) );
+
+#endif // WXWIN_COMPATIBILITY_2_8
+

 
 #endif // wxUSE_TOOLBAR
 
 
 #endif // wxUSE_TOOLBAR
 

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index f8957002e0f8cbc83e5a18752a307975ee96cf1d..50c80846d5054022817eff76fee251e48521e767 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -32,7 +32,9 @@
     #include "wx/control.h"
     #include "wx/frame.h"
     #include "wx/settings.h"
     #include "wx/control.h"
     #include "wx/frame.h"
     #include "wx/settings.h"

-    #include "wx/image.h"
+    #if WXWIN_COMPATIBILITY_2_8
+        #include "wx/image.h"
+    #endif // WXWIN_COMPATIBILITY_2_8

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -674,73 +676,19 @@ void wxToolBarBase::UpdateWindowUI(long flags)
     }
 }
 
     }
 }
 

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

 
 

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

 {
 {

-    dst = src.Copy();
-
-    unsigned char rBg, gBg, bBg;
-    if ( src.HasMask() )
-    {
-        src.GetOrFindMaskColour(&rBg, &gBg, &bBg);
-        dst.SetMaskColour(rBg, gBg, bBg);
-    }
-    else // assuming the pixels along the edges are of the background color
-    {
-        rBg = src.GetRed(0, 0);
-        gBg = src.GetGreen(0, 0);
-        bBg = src.GetBlue(0, 0);
-    }
-
-    const wxColour colBg(rBg, gBg, bBg);
-
-    const wxColour colDark = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW);
-    const wxColour colLight = wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT);
-
-    // 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());
-        }
-    }
+#if wxUSE_IMAGE
+    out = in.ConvertToGreyscale();
+    if ( out.Ok() )
+        return true;
+#endif // wxUSE_IMAGE

 
 

-    return true;
+    return false;

 }
 
 }
 

-#endif // wxUSE_IMAGE
+#endif // WXWIN_COMPATIBILITY_2_8

 
 #endif // wxUSE_TOOLBAR
 
 #endif // wxUSE_TOOLBAR

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 5e4d811bf00016560be98d5686e6718b00814004..39c865b8a022d03799c86e4e6999acff24396a38 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -680,8 +680,8 @@ bool wxToolBar::Realize()
                         // no disabled bitmap specified but we still need to
                         // fill the space in the image list with something, so
                         // we grey out the normal bitmap
                         // no disabled bitmap specified but we still need to
                         // fill the space in the image list with something, so
                         // we grey out the normal bitmap

-                        wxImage imgGreyed;
-                        wxCreateGreyedImage(bmp.ConvertToImage(), imgGreyed);
+                        wxImage
+                          imgGreyed = bmp.ConvertToImage().ConvertToGreyscale();

 
 #ifdef wxREMAP_BUTTON_COLOURS
                         if ( remapValue == Remap_Buttons )
 
 #ifdef wxREMAP_BUTTON_COLOURS
                         if ( remapValue == Remap_Buttons )