projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small doc updates.
[wxWidgets.git]
/
src
/
gtk1
/
bitmap.cpp
diff --git
a/src/gtk1/bitmap.cpp
b/src/gtk1/bitmap.cpp
index 832600e1a2d78c5434e7a7b5c74a75c4318077be..0918af170798ebde32349770366c4f7902f89feb 100644
(file)
--- a/
src/gtk1/bitmap.cpp
+++ b/
src/gtk1/bitmap.cpp
@@
-51,54
+51,56
@@
wxMask::~wxMask()
if (m_bitmap) gdk_bitmap_unref( m_bitmap );
}
if (m_bitmap) gdk_bitmap_unref( m_bitmap );
}
-bool wxMask::Create( const wxBitmap& bitmap, const wxColour& colour )
+bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap),
+ const wxColour& WXUNUSED(colour) )
{
if (m_bitmap)
{
if (m_bitmap)
- {
+ {
gdk_bitmap_unref( m_bitmap );
gdk_bitmap_unref( m_bitmap );
- m_bitmap = (GdkBitmap*) NULL;
+
m_bitmap = (GdkBitmap*) NULL;
}
}
-
- wxFAIL_MSG(
_
T("TODO") );
-
+
+ wxFAIL_MSG(
wx
T("TODO") );
+
return FALSE;
}
return FALSE;
}
-bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap), int WXUNUSED(paletteIndex) )
+bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap),
+ int WXUNUSED(paletteIndex) )
{
if (m_bitmap)
{
if (m_bitmap)
- {
+ {
gdk_bitmap_unref( m_bitmap );
gdk_bitmap_unref( m_bitmap );
- m_bitmap = (GdkBitmap*) NULL;
+
m_bitmap = (GdkBitmap*) NULL;
}
}
-
- wxFAIL_MSG(
_
T("not implemented") );
-
+
+ wxFAIL_MSG(
wx
T("not implemented") );
+
return FALSE;
}
bool wxMask::Create( const wxBitmap& bitmap )
{
if (m_bitmap)
return FALSE;
}
bool wxMask::Create( const wxBitmap& bitmap )
{
if (m_bitmap)
- {
+ {
gdk_bitmap_unref( m_bitmap );
gdk_bitmap_unref( m_bitmap );
- m_bitmap = (GdkBitmap*) NULL;
+
m_bitmap = (GdkBitmap*) NULL;
}
}
-
+
if (!bitmap.Ok()) return FALSE;
if (!bitmap.Ok()) return FALSE;
-
- wxCHECK_MSG( bitmap.GetBitmap(), FALSE,
_
T("Cannot create mask from colour bitmap") );
-
+
+ wxCHECK_MSG( bitmap.GetBitmap(), FALSE,
wx
T("Cannot create mask from colour bitmap") );
+
m_bitmap = gdk_pixmap_new( (GdkWindow*) &gdk_root_parent, bitmap.GetWidth(), bitmap.GetHeight(), 1 );
m_bitmap = gdk_pixmap_new( (GdkWindow*) &gdk_root_parent, bitmap.GetWidth(), bitmap.GetHeight(), 1 );
-
+
if (!m_bitmap) return FALSE;
if (!m_bitmap) return FALSE;
-
+
GdkGC *gc = gdk_gc_new( m_bitmap );
GdkGC *gc = gdk_gc_new( m_bitmap );
-
+
gdk_draw_bitmap( m_bitmap, gc, bitmap.GetBitmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight() );
gdk_draw_bitmap( m_bitmap, gc, bitmap.GetBitmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight() );
-
+
gdk_gc_unref( gc );
gdk_gc_unref( gc );
-
+
return TRUE;
}
return TRUE;
}
@@
-158,13
+160,13
@@
wxBitmap::wxBitmap()
wxBitmap::wxBitmap( int width, int height, int depth )
{
wxBitmap::wxBitmap( int width, int height, int depth )
{
- wxCHECK_RET( (width > 0) && (height > 0),
_
T("invalid bitmap size") )
-
+ wxCHECK_RET( (width > 0) && (height > 0),
wx
T("invalid bitmap size") )
+
GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
if (depth == -1) depth = gdk_window_get_visual( parent )->depth;
GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
if (depth == -1) depth = gdk_window_get_visual( parent )->depth;
-
+
wxCHECK_RET( (depth == gdk_window_get_visual( parent )->depth) ||
wxCHECK_RET( (depth == gdk_window_get_visual( parent )->depth) ||
- (depth == 1),
_
T("invalid bitmap depth") )
+ (depth == 1),
wx
T("invalid bitmap depth") )
m_refData = new wxBitmapRefData();
M_BMPDATA->m_mask = (wxMask *) NULL;
m_refData = new wxBitmapRefData();
M_BMPDATA->m_mask = (wxMask *) NULL;
@@
-186,7
+188,7
@@
wxBitmap::wxBitmap( int width, int height, int depth )
wxBitmap::wxBitmap( const char **bits )
{
wxBitmap::wxBitmap( const char **bits )
{
- wxCHECK_RET( bits != NULL,
_
T("invalid bitmap data") )
+ wxCHECK_RET( bits != NULL,
wx
T("invalid bitmap data") )
m_refData = new wxBitmapRefData();
m_refData = new wxBitmapRefData();
@@
-209,7
+211,7
@@
wxBitmap::wxBitmap( const char **bits )
wxBitmap::wxBitmap( char **bits )
{
wxBitmap::wxBitmap( char **bits )
{
- wxCHECK_RET( bits != NULL,
_
T("invalid bitmap data") )
+ wxCHECK_RET( bits != NULL,
wx
T("invalid bitmap data") )
m_refData = new wxBitmapRefData();
m_refData = new wxBitmapRefData();
@@
-218,7
+220,7
@@
wxBitmap::wxBitmap( char **bits )
M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( parent, &mask, NULL, (gchar **) bits );
M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( parent, &mask, NULL, (gchar **) bits );
- wxCHECK_RET( M_BMPDATA->m_pixmap,
_
T("couldn't create pixmap") );
+ wxCHECK_RET( M_BMPDATA->m_pixmap,
wx
T("couldn't create pixmap") );
if (mask)
{
if (mask)
{
@@
-257,7
+259,7
@@
wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth
M_BMPDATA->m_height = height;
M_BMPDATA->m_bpp = 1;
M_BMPDATA->m_height = height;
M_BMPDATA->m_bpp = 1;
- wxCHECK_RET( M_BMPDATA->m_bitmap,
_
T("couldn't create bitmap") );
+ wxCHECK_RET( M_BMPDATA->m_bitmap,
wx
T("couldn't create bitmap") );
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
}
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
}
@@
-291,35
+293,35
@@
bool wxBitmap::Ok() const
int wxBitmap::GetHeight() const
{
int wxBitmap::GetHeight() const
{
- wxCHECK_MSG( Ok(), -1,
_
T("invalid bitmap") );
+ wxCHECK_MSG( Ok(), -1,
wx
T("invalid bitmap") );
return M_BMPDATA->m_height;
}
int wxBitmap::GetWidth() const
{
return M_BMPDATA->m_height;
}
int wxBitmap::GetWidth() const
{
- wxCHECK_MSG( Ok(), -1,
_
T("invalid bitmap") );
+ wxCHECK_MSG( Ok(), -1,
wx
T("invalid bitmap") );
return M_BMPDATA->m_width;
}
int wxBitmap::GetDepth() const
{
return M_BMPDATA->m_width;
}
int wxBitmap::GetDepth() const
{
- wxCHECK_MSG( Ok(), -1,
_
T("invalid bitmap") );
+ wxCHECK_MSG( Ok(), -1,
wx
T("invalid bitmap") );
return M_BMPDATA->m_bpp;
}
wxMask *wxBitmap::GetMask() const
{
return M_BMPDATA->m_bpp;
}
wxMask *wxBitmap::GetMask() const
{
- wxCHECK_MSG( Ok(), (wxMask *) NULL,
_
T("invalid bitmap") );
+ wxCHECK_MSG( Ok(), (wxMask *) NULL,
wx
T("invalid bitmap") );
return M_BMPDATA->m_mask;
}
void wxBitmap::SetMask( wxMask *mask )
{
return M_BMPDATA->m_mask;
}
void wxBitmap::SetMask( wxMask *mask )
{
- wxCHECK_RET( Ok(),
_
T("invalid bitmap") );
+ wxCHECK_RET( Ok(),
wx
T("invalid bitmap") );
if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
@@
-328,12
+330,12
@@
void wxBitmap::SetMask( wxMask *mask )
bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) )
{
bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) )
{
- wxCHECK_MSG( Ok(), FALSE,
_
T("invalid bitmap") );
+ wxCHECK_MSG( Ok(), FALSE,
wx
T("invalid bitmap") );
if (type == wxBITMAP_TYPE_PNG)
{
wxImage image( *this );
if (type == wxBITMAP_TYPE_PNG)
{
wxImage image( *this );
- if (image.Ok()) return image.SaveFile( name, type );
+
if (image.Ok()) return image.SaveFile( name, type );
}
return FALSE;
}
return FALSE;
@@
-418,14
+420,14
@@
void wxBitmap::SetPixmap( GdkPixmap *pixmap )
GdkPixmap *wxBitmap::GetPixmap() const
{
GdkPixmap *wxBitmap::GetPixmap() const
{
- wxCHECK_MSG( Ok(), (GdkPixmap *) NULL,
_
T("invalid bitmap") );
+ wxCHECK_MSG( Ok(), (GdkPixmap *) NULL,
wx
T("invalid bitmap") );
return M_BMPDATA->m_pixmap;
}
GdkBitmap *wxBitmap::GetBitmap() const
{
return M_BMPDATA->m_pixmap;
}
GdkBitmap *wxBitmap::GetBitmap() const
{
- wxCHECK_MSG( Ok(), (GdkBitmap *) NULL,
_
T("invalid bitmap") );
+ wxCHECK_MSG( Ok(), (GdkBitmap *) NULL,
wx
T("invalid bitmap") );
return M_BMPDATA->m_bitmap;
}
return M_BMPDATA->m_bitmap;
}