reverted relative include path

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

diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index ab0d7294a26a7abdac49c07d4d8aa53c5f1649e0..4360b9748d770c3126796a878bdf2550d3ebeada 100644 (file)
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -7,11 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "cursor.h"
 #endif
 
 #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"
 #include "wx/cursor.h"
 #include "wx/utils.h"
 #include "wx/app.h"


@@ -68,7 +70,9 @@ wxCursor::wxCursor( int cursorId )
     GdkCursorType gdk_cur = GDK_LEFT_PTR;
     switch (cursorId)
     {
     GdkCursorType gdk_cur = GDK_LEFT_PTR;
     switch (cursorId)
     {

+        case wxCURSOR_ARROW:            // fall through to default

         case wxCURSOR_DEFAULT:          gdk_cur = GDK_LEFT_PTR; break;
         case wxCURSOR_DEFAULT:          gdk_cur = GDK_LEFT_PTR; break;

+        case wxCURSOR_RIGHT_ARROW:      gdk_cur = GDK_RIGHT_PTR; break;

         case wxCURSOR_HAND:             gdk_cur = GDK_HAND1; break;
         case wxCURSOR_CROSS:            gdk_cur = GDK_CROSSHAIR; break;
         case wxCURSOR_SIZEWE:           gdk_cur = GDK_SB_H_DOUBLE_ARROW; break;
         case wxCURSOR_HAND:             gdk_cur = GDK_HAND1; break;
         case wxCURSOR_CROSS:            gdk_cur = GDK_CROSSHAIR; break;
         case wxCURSOR_SIZEWE:           gdk_cur = GDK_SB_H_DOUBLE_ARROW; break;


@@ -103,8 +107,6 @@ wxCursor::wxCursor( int cursorId )
         default:
             wxFAIL_MSG(wxT("unsupported cursor type"));
             // will use the standard one
         default:
             wxFAIL_MSG(wxT("unsupported cursor type"));
             // will use the standard one

-
-        case wxCURSOR_ARROW:

             break;
     }
 
             break;
     }
 


@@ -142,145 +144,166 @@ wxCursor::wxCursor(const char bits[], int width, int  height,
 
 
 wxCursor::wxCursor( const wxCursor &cursor )
 
 
 wxCursor::wxCursor( const wxCursor &cursor )

+    : wxObject()

 {
     Ref( cursor );
 }
 
 #if wxUSE_IMAGE
 {
     Ref( cursor );
 }
 
 #if wxUSE_IMAGE

+

 wxCursor::wxCursor( const wxImage & image )
 {
     unsigned char * rgbBits = image.GetData();
 wxCursor::wxCursor( const wxImage & image )
 {
     unsigned char * rgbBits = image.GetData();

-    int w = image.GetWidth()  ;
-    int h = image.GetHeight() ;
-    bool bHasMask = image.HasMask() ;
+    int w = image.GetWidth() ;
+    int h = image.GetHeight();
+    bool bHasMask = image.HasMask();

     int imagebitcount = (w*h)/8;
 
     int imagebitcount = (w*h)/8;
 

-    unsigned char r, g, b ;

     unsigned char * bits = new unsigned char [imagebitcount];
     unsigned char * maskBits = new unsigned char [imagebitcount];
 
     unsigned char * bits = new unsigned char [imagebitcount];
     unsigned char * maskBits = new unsigned char [imagebitcount];
 

-    int i,j, i8; unsigned char c, cMask;
+    int i, j, i8; unsigned char c, cMask;

     for (i=0; i<imagebitcount; i++)
     for (i=0; i<imagebitcount; i++)

-        {
+    {

         bits[i] = 0;
         i8 = i * 8;
 
         cMask = 1;
         for (j=0; j<8; j++)
         bits[i] = 0;
         i8 = i * 8;
 
         cMask = 1;
         for (j=0; j<8; j++)

-           {
-           // possible overflow if we do the summation first ?
-           c = rgbBits[(i8+j)*3]/3 + rgbBits[(i8+j)*3+1]/3 + rgbBits[(i8+j)*3+2]/3 ;
-           //if average value is > mid grey
-           if (c>127)
-              bits[i] = bits[i] | cMask ;
-           cMask = cMask * 2 ;
-           }
+        {
+            // possible overflow if we do the summation first ?
+            c = rgbBits[(i8+j)*3]/3 + rgbBits[(i8+j)*3+1]/3 + rgbBits[(i8+j)*3+2]/3;
+            //if average value is > mid grey
+            if (c>127)
+                bits[i] = bits[i] | cMask;
+            cMask = cMask * 2;

         }
         }

+    }
+
+    unsigned long keyMaskColor;

     if (bHasMask)
     if (bHasMask)

-        {
-        r = image.GetMaskRed() ;
-        g = image.GetMaskGreen() ;
-        b = image.GetMaskBlue() ;
+    {
+        unsigned char
+            r = image.GetMaskRed(),
+            g = image.GetMaskGreen(),
+            b = image.GetMaskBlue();

 
         for (i=0; i<imagebitcount; i++)
         {
 
         for (i=0; i<imagebitcount; i++)
         {

-        maskBits[i] = 0x0;
-        i8 = i * 8;
+            maskBits[i] = 0x0;
+            i8 = i * 8;

 
 

-        cMask = 1;
-        for (j=0; j<8; j++)
-           {
-           if (rgbBits[(i8+j)*3] != r || rgbBits[(i8+j)*3+1] != g || rgbBits[(i8+j)*3+2] != b)
-              maskBits[i] = maskBits[i] | cMask ;
-           cMask = cMask * 2 ;
-           }
-        }
+            cMask = 1;
+            for (j=0; j<8; j++)
+            {
+                if (rgbBits[(i8+j)*3] != r || rgbBits[(i8+j)*3+1] != g || rgbBits[(i8+j)*3+2] != b)
+                    maskBits[i] = maskBits[i] | cMask;
+                cMask = cMask * 2;
+            }

         }
         }

-      else
-        {
+
+        keyMaskColor = (r << 16) | (g << 8) | b;
+    }
+    else // no mask
+    {

         for (i=0; i<imagebitcount; i++)
         for (i=0; i<imagebitcount; i++)

-            maskBits[i]= 0xFF ;
-        }
-    //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();
-    wxHashTable hTable;
+            maskBits[i] = 0xFF;

 
 

-    //colors as rrggbb
-    unsigned long key;
-    unsigned long keyMaskColor = 0;
-    if (bHasMask) keyMaskColor = (r << 16) | (g << 8) | b;
+        // init it to avoid compiler warnings
+        keyMaskColor = 0;
+    }

 
 

-    tmpImage.ComputeHistogram( hTable );
+    // find the most frequent color(s)
+    wxImageHistogram histogram;
+    image.ComputeHistogram(histogram);

 
 

-    long MostFreqCol = 0 ; long nMost = 0;
-    long NextFreqCol = 0 ; long nNext = 0;
-    long value ;
-    hTable.BeginFind();
-    wxNode *node = NULL;
-    while ((node = hTable.Next()) != NULL)
+    // colors as rrggbb
+    unsigned long key;
+    unsigned long value;
+
+    long colMostFreq = 0;
+    unsigned long nMost = 0;
+    long colNextMostFreq = 0;
+    unsigned long nNext = 0;
+    for ( wxImageHistogram::iterator entry = histogram.begin();
+          entry != histogram.end();
+          ++entry )

     {
     {

-        wxHNode *hnode = (wxHNode*) node->GetData();
-        value = hnode->value;
-        key = node->GetKeyInteger() ;
-        if (!bHasMask || (key != keyMaskColor) )
+        value = entry->second.value;
+        key = entry->first;
+        if ( !bHasMask || (key != keyMaskColor) )

         {
         {

-        if (value > nMost)
+            if (value > nMost)

             {
             {

-            nMost = value;
-            MostFreqCol = key;
+                nMost = value;
+                colMostFreq = key;

             }
             }

-        else
-            if (value > nNext)
+            else if (value > nNext)

             {
             {

-            nNext = value ;
-            NextFreqCol = key;
+                nNext = value;
+                colNextMostFreq = key;

             }
         }
     }
 
             }
         }
     }
 

+    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;

 
 

-    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;
+    if (image.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y))
+        hotSpotY = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y);
+    else
+        hotSpotY = 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 (hotSpotX < 0 || hotSpotX >= w)
     if (hotSpotX < 0 || hotSpotX >= w)

-            hotSpotX = 0;
+        hotSpotX = 0;

     if (hotSpotY < 0 || hotSpotY >= h)
     if (hotSpotY < 0 || hotSpotY >= h)

-            hotSpotY = 0;
+        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_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 );
 
     gdk_bitmap_unref( data );
     gdk_bitmap_unref( mask );

-    delete [] bits ;
+    delete [] bits;

     delete [] maskBits;
     delete [] maskBits;

-

 }
 }

-#endif
+
+#endif // wxUSE_IMAGE

 
 wxCursor::~wxCursor()
 {
 
 wxCursor::~wxCursor()
 {


@@ -344,7 +367,7 @@ void wxEndBusyCursor()
     gs_savedCursor = wxNullCursor;
 
     if (wxTheApp)
     gs_savedCursor = wxNullCursor;
 
     if (wxTheApp)

-        wxTheApp->SendIdleEvents();
+        wxTheApp->ProcessIdle();

 }
 
 void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
 }
 
 void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )


@@ -360,8 +383,8 @@ void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
     wxSetCursor( wxCursor(wxCURSOR_WATCH) );
 
     if (wxTheApp)
     wxSetCursor( wxCursor(wxCURSOR_WATCH) );
 
     if (wxTheApp)

-        wxTheApp->SendIdleEvents();
-        
+        wxTheApp->ProcessIdle();
+

     gdk_flush();
 }
 
     gdk_flush();
 }