fix for gtk swapped colors

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

diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index f23daacbb9fadcdd04ec59c58b983d29506a86be..54bd0e23a3f612432b3faeaf75dfb88531ab6c0b 100644 (file)
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -254,6 +254,17 @@ wxCursor::wxCursor( const wxImage & image )
                              (unsigned char)(colNextMostFreq >> 8),
                              (unsigned char)(colNextMostFreq) );
 
+    int fg_intensity = fg.Red() + fg.Green() + fg.Blue();
+    int bg_intensity = bg.Red() + bg.Green() + bg.Blue();
+       
+       if (bg_intensity > fg_intensity)
+       {
+        //swap fg and bg
+        wxColour tmp = fg;
+        fg = bg;
+        bg = tmp;
+       }                                                        
+
     int hotSpotX;
     int hotSpotY;
 

diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp
index f23daacbb9fadcdd04ec59c58b983d29506a86be..54bd0e23a3f612432b3faeaf75dfb88531ab6c0b 100644 (file)
--- a/src/gtk1/cursor.cpp
+++ b/src/gtk1/cursor.cpp
@@ -254,6 +254,17 @@ wxCursor::wxCursor( const wxImage & image )
                              (unsigned char)(colNextMostFreq >> 8),
                              (unsigned char)(colNextMostFreq) );
 
+    int fg_intensity = fg.Red() + fg.Green() + fg.Blue();
+    int bg_intensity = bg.Red() + bg.Green() + bg.Blue();
+       
+       if (bg_intensity > fg_intensity)
+       {
+        //swap fg and bg
+        wxColour tmp = fg;
+        fg = bg;
+        bg = tmp;
+       }                                                        
+
     int hotSpotX;
     int hotSpotY;