projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct EnsureVisible() to show last item entirely
[wxWidgets.git]
/
src
/
gtk1
/
statbmp.cpp
diff --git
a/src/gtk1/statbmp.cpp
b/src/gtk1/statbmp.cpp
index a33dcd4ecc1400fd69714d2339bc80c4a0286649..03a0f9682a46ef1a3cf210d14babbc9500b87c78 100644
(file)
--- a/
src/gtk1/statbmp.cpp
+++ b/
src/gtk1/statbmp.cpp
@@
-34,14
+34,12
@@
wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap
Create( parent, id, bitmap, pos, size, style, name );
}
Create( parent, id, bitmap, pos, size, style, name );
}
-#ifndef __WXGTK20__
// empty bitmap, so that we can create GtkPixmap widget:
static char * bogus_xpm[] = {
"2 2 1 1",
" c None",
" ",
" "};
// empty bitmap, so that we can create GtkPixmap widget:
static char * bogus_xpm[] = {
"2 2 1 1",
" c None",
" ",
" "};
-#endif
bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
const wxPoint &pos, const wxSize &size,
bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
const wxPoint &pos, const wxSize &size,
@@
-58,12
+56,8
@@
bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
m_bitmap = bitmap;
m_bitmap = bitmap;
-#ifdef __WXGTK20__
- m_widget = gtk_image_new();
-#else
wxBitmap bmp(bitmap.Ok() ? bitmap : wxBitmap(bogus_xpm));
m_widget = gtk_pixmap_new(bmp.GetPixmap(), NULL);
wxBitmap bmp(bitmap.Ok() ? bitmap : wxBitmap(bogus_xpm));
m_widget = gtk_pixmap_new(bmp.GetPixmap(), NULL);
-#endif
if (bitmap.Ok())
SetBitmap(bitmap);
if (bitmap.Ok())
SetBitmap(bitmap);
@@
-83,19
+77,8
@@
void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
GdkBitmap *mask = (GdkBitmap *) NULL;
if (m_bitmap.GetMask())
mask = m_bitmap.GetMask()->GetBitmap();
GdkBitmap *mask = (GdkBitmap *) NULL;
if (m_bitmap.GetMask())
mask = m_bitmap.GetMask()->GetBitmap();
-
-#ifdef __WXGTK20__
- if (m_bitmap.HasPixbuf())
- {
- gtk_image_set_from_pixbuf(GTK_IMAGE(m_widget),
- m_bitmap.GetPixbuf());
- }
- else
- gtk_image_set_from_pixmap(GTK_IMAGE(m_widget),
- m_bitmap.GetPixmap(), mask);
-#else
+
gtk_pixmap_set(GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask);
gtk_pixmap_set(GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask);
-#endif
InvalidateBestSize();
SetSize(GetBestSize());
InvalidateBestSize();
SetSize(GetBestSize());