Fix the off-by-one a little differently, and correct a refresh problem

[wxWidgets.git] / src / gtk1 / cursor.cpp

diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp
index 8bcc0d0ce19cafc7c6407445a2c9554981dee74b..4360b9748d770c3126796a878bdf2550d3ebeada 100644 (file)
--- a/src/gtk1/cursor.cpp
+++ b/src/gtk1/cursor.cpp
@@ -7,11 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "cursor.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/cursor.h"
 #include "wx/utils.h"
 #include "wx/app.h"
@@ -142,6 +144,7 @@ wxCursor::wxCursor(const char bits[], int width, int  height,
 
 
 wxCursor::wxCursor( const wxCursor &cursor )
+    : wxObject()
 {
     Ref( cursor );
 }
@@ -210,24 +213,21 @@ wxCursor::wxCursor( const wxImage & image )
         keyMaskColor = 0;
     }
 
-    // find the most frequent color(s) it seems a waste of effort to copy the
-    // image but otherwise we need to remove the const modifier ??
-    wxImage tmpImage = image.Copy();
+    // find the most frequent color(s)
     wxImageHistogram histogram;
+    image.ComputeHistogram(histogram);
 
     // colors as rrggbb
     unsigned long key;
     unsigned long value;
 
-    tmpImage.ComputeHistogram(histogram);
-
-    long MostFreqCol = 0;
+    long colMostFreq = 0;
     unsigned long nMost = 0;
-    long NextFreqCol = 0;
+    long colNextMostFreq = 0;
     unsigned long nNext = 0;
-    wxImageHistogram::iterator entry = histogram.begin();
-
-    while ( entry != histogram.end() )
+    for ( wxImageHistogram::iterator entry = histogram.begin();
+          entry != histogram.end();
+          ++entry )
     {
         value = entry->second.value;
         key = entry->first;
@@ -236,46 +236,66 @@ wxCursor::wxCursor( const wxImage & image )
             if (value > nMost)
             {
                 nMost = value;
-                MostFreqCol = key;
+                colMostFreq = key;
             }
             else if (value > nNext)
             {
                 nNext = value;
-                NextFreqCol = key;
+                colNextMostFreq = key;
             }
         }
     }
 
-    wxColour fg = wxColour ( (unsigned char)(MostFreqCol >> 16),
-                             (unsigned char)(MostFreqCol >> 8),
-                             (unsigned char)(MostFreqCol) );
-
-    wxColour bg = wxColour ( (unsigned char)(NextFreqCol >> 16),
-                             (unsigned char)(NextFreqCol >> 8),
-                             (unsigned char)(NextFreqCol) );
-
-    int hotSpotX=0;
-    int hotSpotY=0;
+    wxColour fg = wxColour ( (unsigned char)(colMostFreq >> 16),
+                             (unsigned char)(colMostFreq >> 8),
+                             (unsigned char)(colMostFreq) );
+
+    wxColour bg = wxColour ( (unsigned char)(colNextMostFreq >> 16),
+                             (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;
+
+    if (image.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X))
+        hotSpotX = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X);
+    else
+        hotSpotX = 0;
 
-    if (image.HasOption(wxCUR_HOTSPOT_X))
-        hotSpotX = image.GetOptionInt(wxCUR_HOTSPOT_X);
-    if (image.HasOption(wxCUR_HOTSPOT_Y))
-        hotSpotY = image.GetOptionInt(wxCUR_HOTSPOT_Y);
+    if (image.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y))
+        hotSpotY = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y);
+    else
+        hotSpotY = 0;
 
     if (hotSpotX < 0 || hotSpotX >= w)
         hotSpotX = 0;
     if (hotSpotY < 0 || hotSpotY >= h)
         hotSpotY = 0;
 
-    GdkBitmap *data = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) bits,
-        w, h );
-    GdkBitmap *mask = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) maskBits,
-        w, h );
+    GdkBitmap *data = gdk_bitmap_create_from_data(wxGetRootWindow()->window,
+                                                  (gchar *) bits, w, h);
+    GdkBitmap *mask = gdk_bitmap_create_from_data(wxGetRootWindow()->window,
+                                                  (gchar *) maskBits, w, h);
 
     m_refData = new wxCursorRefData;
-    M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap(
-        data, mask, fg.GetColor(), bg.GetColor(),
-        hotSpotX, hotSpotY );
+    M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap
+                             (
+                                data,
+                                mask,
+                                fg.GetColor(), bg.GetColor(),
+                                hotSpotX, hotSpotY
+                             );
 
     gdk_bitmap_unref( data );
     gdk_bitmap_unref( mask );
@@ -347,7 +367,7 @@ void wxEndBusyCursor()
     gs_savedCursor = wxNullCursor;
 
     if (wxTheApp)
-        wxTheApp->SendIdleEvents();
+        wxTheApp->ProcessIdle();
 }
 
 void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
@@ -363,7 +383,7 @@ void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
     wxSetCursor( wxCursor(wxCURSOR_WATCH) );
 
     if (wxTheApp)
-        wxTheApp->SendIdleEvents();
+        wxTheApp->ProcessIdle();
 
     gdk_flush();
 }