Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added wxCursor ctor for creation from bits array

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-11-18 14:46:58 +00:00
parent 5740d24a02
commit a1db952fde
4 changed files with 68 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/gtk/cursor.h
View File

@@ -30,6 +30,9 @@ public:
wxCursor(); wxCursor();
wxCursor( int cursorId ); wxCursor( int cursorId );
wxCursor( const wxCursor &cursor ); wxCursor( const wxCursor &cursor );
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(); ~wxCursor();
wxCursor& operator = ( const wxCursor& cursor ); wxCursor& operator = ( const wxCursor& cursor );
bool operator == ( const wxCursor& cursor ) const; bool operator == ( const wxCursor& cursor ) const;

3
include/wx/gtk1/cursor.h
View File

@@ -30,6 +30,9 @@ public:
wxCursor(); wxCursor();
wxCursor( int cursorId ); wxCursor( int cursorId );
wxCursor( const wxCursor &cursor ); wxCursor( const wxCursor &cursor );
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(); ~wxCursor();
wxCursor& operator = ( const wxCursor& cursor ); wxCursor& operator = ( const wxCursor& cursor );
bool operator == ( const wxCursor& cursor ) const; bool operator == ( const wxCursor& cursor ) const;

31
src/gtk/cursor.cpp
View File

@@ -16,6 +16,7 @@
#include "wx/utils.h" #include "wx/utils.h"
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <gtk/gtk.h>
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// idle system // idle system
@@ -107,6 +108,36 @@ wxCursor::wxCursor( int cursorId )
M_CURSORDATA->m_cursor = gdk_cursor_new( gdk_cur ); M_CURSORDATA->m_cursor = gdk_cursor_new( gdk_cur );
} }
extern GtkWidget *wxRootWindow;
wxCursor::wxCursor(const char bits[], int width, int height,
int hotSpotX, int hotSpotY,
const char maskBits[], wxColour *fg, wxColour *bg)
{
if (!maskBits)
maskBits = bits;
if (!fg)
fg = wxBLACK;
if (!bg)
bg = wxWHITE;
if (hotSpotX < 0 || hotSpotX >= width)
hotSpotX = 0;
if (hotSpotY < 0 || hotSpotY >= height)
hotSpotY = 0;
GdkBitmap *data = gdk_bitmap_create_from_data( wxRootWindow->window, (gchar *) bits, width, height );
GdkBitmap *mask = gdk_bitmap_create_from_data( wxRootWindow->window, (gchar *) maskBits, width, height);
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 );
}
wxCursor::wxCursor( const wxCursor &cursor ) wxCursor::wxCursor( const wxCursor &cursor )
{ {
Ref( cursor ); Ref( cursor );

31
src/gtk1/cursor.cpp
View File

@@ -16,6 +16,7 @@
#include "wx/utils.h" #include "wx/utils.h"
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <gtk/gtk.h>
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// idle system // idle system
@@ -107,6 +108,36 @@ wxCursor::wxCursor( int cursorId )
M_CURSORDATA->m_cursor = gdk_cursor_new( gdk_cur ); M_CURSORDATA->m_cursor = gdk_cursor_new( gdk_cur );
} }
extern GtkWidget *wxRootWindow;
wxCursor::wxCursor(const char bits[], int width, int height,
int hotSpotX, int hotSpotY,
const char maskBits[], wxColour *fg, wxColour *bg)
{
if (!maskBits)
maskBits = bits;
if (!fg)
fg = wxBLACK;
if (!bg)
bg = wxWHITE;
if (hotSpotX < 0 || hotSpotX >= width)
hotSpotX = 0;
if (hotSpotY < 0 || hotSpotY >= height)
hotSpotY = 0;
GdkBitmap *data = gdk_bitmap_create_from_data( wxRootWindow->window, (gchar *) bits, width, height );
GdkBitmap *mask = gdk_bitmap_create_from_data( wxRootWindow->window, (gchar *) maskBits, width, height);
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 );
}
wxCursor::wxCursor( const wxCursor &cursor ) wxCursor::wxCursor( const wxCursor &cursor )
{ {
Ref( cursor ); Ref( cursor );