Applied wxImage -> wxCursor patch, tool window event table fix

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

diff --git a/contrib/src/fl/toolwnd.cpp b/contrib/src/fl/toolwnd.cpp
index 06db16ed57fdeb11920f9f66c6b051b2cb87d9e4..171e3df845fa770b471e43b450701b2c58c718cd 100644 (file)
--- a/contrib/src/fl/toolwnd.cpp
+++ b/contrib/src/fl/toolwnd.cpp
@@ -41,9 +41,9 @@ static const unsigned char _gCheckerImg[16] = { _IMG_A,_IMG_B,_IMG_C,_IMG_D,
 
 /***** Implementation for class wxToolWindow *****/
 
 
 /***** Implementation for class wxToolWindow *****/
 

-IMPLEMENT_DYNAMIC_CLASS( wxToolWindow, wxWindow )
+IMPLEMENT_DYNAMIC_CLASS( wxToolWindow, wxFrame)

 
 

-BEGIN_EVENT_TABLE( wxToolWindow, wxWindow )
+BEGIN_EVENT_TABLE( wxToolWindow, wxFrame )

 
        EVT_PAINT    ( wxToolWindow::OnPaint )
        EVT_MOTION   ( wxToolWindow::OnMotion )
 
        EVT_PAINT    ( wxToolWindow::OnPaint )
        EVT_MOTION   ( wxToolWindow::OnMotion )

diff --git a/include/wx/gtk/cursor.h b/include/wx/gtk/cursor.h
index 6027e12790131c4919b6d8b37e2123706e835c5a..e91fc3a381207f890fcfde2cc1e748f94f19cb08 100644 (file)
--- a/include/wx/gtk/cursor.h
+++ b/include/wx/gtk/cursor.h
@@ -19,6 +19,10 @@
 #include "wx/object.h"
 #include "wx/gdicmn.h"
 
 #include "wx/object.h"
 #include "wx/gdicmn.h"
 

+#if wxUSE_IMAGE
+#include "wx/image.h"
+#endif
+

 //-----------------------------------------------------------------------------
 // wxCursor
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxCursor
 //-----------------------------------------------------------------------------


@@ -30,6 +34,9 @@ public:
     wxCursor();
     wxCursor( int cursorId );
     wxCursor( const wxCursor &cursor );
     wxCursor();
     wxCursor( int cursorId );
     wxCursor( const wxCursor &cursor );

+#if wxUSE_IMAGE
+    wxCursor( const wxImage & image );
+#endif

     wxCursor( const char bits[], int width, int  height,
               int hotSpotX=-1, int hotSpotY=-1,
               const char maskBits[]=0, wxColour *fg=0, wxColour *bg=0 );
     wxCursor( const char bits[], int width, int  height,
               int hotSpotX=-1, int hotSpotY=-1,
               const char maskBits[]=0, wxColour *fg=0, wxColour *bg=0 );

diff --git a/include/wx/gtk1/cursor.h b/include/wx/gtk1/cursor.h
index 6027e12790131c4919b6d8b37e2123706e835c5a..e91fc3a381207f890fcfde2cc1e748f94f19cb08 100644 (file)
--- a/include/wx/gtk1/cursor.h
+++ b/include/wx/gtk1/cursor.h
@@ -19,6 +19,10 @@
 #include "wx/object.h"
 #include "wx/gdicmn.h"
 
 #include "wx/object.h"
 #include "wx/gdicmn.h"
 

+#if wxUSE_IMAGE
+#include "wx/image.h"
+#endif
+

 //-----------------------------------------------------------------------------
 // wxCursor
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxCursor
 //-----------------------------------------------------------------------------


@@ -30,6 +34,9 @@ public:
     wxCursor();
     wxCursor( int cursorId );
     wxCursor( const wxCursor &cursor );
     wxCursor();
     wxCursor( int cursorId );
     wxCursor( const wxCursor &cursor );

+#if wxUSE_IMAGE
+    wxCursor( const wxImage & image );
+#endif

     wxCursor( const char bits[], int width, int  height,
               int hotSpotX=-1, int hotSpotY=-1,
               const char maskBits[]=0, wxColour *fg=0, wxColour *bg=0 );
     wxCursor( const char bits[], int width, int  height,
               int hotSpotX=-1, int hotSpotY=-1,
               const char maskBits[]=0, wxColour *fg=0, wxColour *bg=0 );

diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index c233aecccc81ab6e2b1695273b54ad79f91e9de3..ab0d7294a26a7abdac49c07d4d8aa53c5f1649e0 100644 (file)
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -58,6 +58,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCursor,wxObject)
 
 wxCursor::wxCursor()
 {
 
 wxCursor::wxCursor()
 {

+

 }
 
 wxCursor::wxCursor( int cursorId )
 }
 
 wxCursor::wxCursor( int cursorId )


@@ -145,6 +146,142 @@ wxCursor::wxCursor( const wxCursor &cursor )
     Ref( cursor );
 }
 
     Ref( cursor );
 }
 

+#if wxUSE_IMAGE
+wxCursor::wxCursor( const wxImage & image )
+{
+    unsigned char * rgbBits = image.GetData();
+    int w = image.GetWidth()  ;
+    int h = image.GetHeight() ;
+    bool bHasMask = image.HasMask() ;
+    int imagebitcount = (w*h)/8;
+
+    unsigned char r, g, b ;
+    unsigned char * bits = new unsigned char [imagebitcount];
+    unsigned char * maskBits = new unsigned char [imagebitcount];
+
+    int i,j, i8; unsigned char c, cMask;
+    for (i=0; i<imagebitcount; i++)
+        {
+        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 ;
+           }
+        }
+    if (bHasMask)
+        {
+        r = image.GetMaskRed() ;
+        g = image.GetMaskGreen() ;
+        b = image.GetMaskBlue() ;
+
+        for (i=0; i<imagebitcount; i++)
+        {
+        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 ;
+           }
+        }
+        }
+      else
+        {
+        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;
+
+    //colors as rrggbb
+    unsigned long key;
+    unsigned long keyMaskColor = 0;
+    if (bHasMask) keyMaskColor = (r << 16) | (g << 8) | b;
+
+    tmpImage.ComputeHistogram( hTable );
+
+    long MostFreqCol = 0 ; long nMost = 0;
+    long NextFreqCol = 0 ; long nNext = 0;
+    long value ;
+    hTable.BeginFind();
+    wxNode *node = NULL;
+    while ((node = hTable.Next()) != NULL)
+    {
+        wxHNode *hnode = (wxHNode*) node->GetData();
+        value = hnode->value;
+        key = node->GetKeyInteger() ;
+        if (!bHasMask || (key != keyMaskColor) )
+        {
+        if (value > nMost)
+            {
+            nMost = value;
+            MostFreqCol = key;
+            }
+        else
+            if (value > nNext)
+            {
+            nNext = value ;
+            NextFreqCol = 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;
+
+    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)
+            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 );
+
+    m_refData = new wxCursorRefData;
+    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 );
+    delete [] bits ;
+    delete [] maskBits;
+
+}
+#endif
+

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

diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp
index c233aecccc81ab6e2b1695273b54ad79f91e9de3..ab0d7294a26a7abdac49c07d4d8aa53c5f1649e0 100644 (file)
--- a/src/gtk1/cursor.cpp
+++ b/src/gtk1/cursor.cpp
@@ -58,6 +58,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCursor,wxObject)
 
 wxCursor::wxCursor()
 {
 
 wxCursor::wxCursor()
 {

+

 }
 
 wxCursor::wxCursor( int cursorId )
 }
 
 wxCursor::wxCursor( int cursorId )


@@ -145,6 +146,142 @@ wxCursor::wxCursor( const wxCursor &cursor )
     Ref( cursor );
 }
 
     Ref( cursor );
 }
 

+#if wxUSE_IMAGE
+wxCursor::wxCursor( const wxImage & image )
+{
+    unsigned char * rgbBits = image.GetData();
+    int w = image.GetWidth()  ;
+    int h = image.GetHeight() ;
+    bool bHasMask = image.HasMask() ;
+    int imagebitcount = (w*h)/8;
+
+    unsigned char r, g, b ;
+    unsigned char * bits = new unsigned char [imagebitcount];
+    unsigned char * maskBits = new unsigned char [imagebitcount];
+
+    int i,j, i8; unsigned char c, cMask;
+    for (i=0; i<imagebitcount; i++)
+        {
+        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 ;
+           }
+        }
+    if (bHasMask)
+        {
+        r = image.GetMaskRed() ;
+        g = image.GetMaskGreen() ;
+        b = image.GetMaskBlue() ;
+
+        for (i=0; i<imagebitcount; i++)
+        {
+        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 ;
+           }
+        }
+        }
+      else
+        {
+        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;
+
+    //colors as rrggbb
+    unsigned long key;
+    unsigned long keyMaskColor = 0;
+    if (bHasMask) keyMaskColor = (r << 16) | (g << 8) | b;
+
+    tmpImage.ComputeHistogram( hTable );
+
+    long MostFreqCol = 0 ; long nMost = 0;
+    long NextFreqCol = 0 ; long nNext = 0;
+    long value ;
+    hTable.BeginFind();
+    wxNode *node = NULL;
+    while ((node = hTable.Next()) != NULL)
+    {
+        wxHNode *hnode = (wxHNode*) node->GetData();
+        value = hnode->value;
+        key = node->GetKeyInteger() ;
+        if (!bHasMask || (key != keyMaskColor) )
+        {
+        if (value > nMost)
+            {
+            nMost = value;
+            MostFreqCol = key;
+            }
+        else
+            if (value > nNext)
+            {
+            nNext = value ;
+            NextFreqCol = 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;
+
+    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)
+            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 );
+
+    m_refData = new wxCursorRefData;
+    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 );
+    delete [] bits ;
+    delete [] maskBits;
+
+}
+#endif
+

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