projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved wxDash typedef to gdicmn.h
[wxWidgets.git]
/
src
/
gtk
/
statbmp.cpp
diff --git
a/src/gtk/statbmp.cpp
b/src/gtk/statbmp.cpp
index 186947afb2edc9808db3b90740d0a4715f788b2a..e86af74122a1580f3c71253da6927f55e997bfee 100644
(file)
--- a/
src/gtk/statbmp.cpp
+++ b/
src/gtk/statbmp.cpp
@@
-37,7
+37,7
@@
wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap
void wxStaticBitmap::CreatePixmapWidget()
{
void wxStaticBitmap::CreatePixmapWidget()
{
- wxCHECK_RET( m_bitmap.Ok(), T("should only be called if we have a bitmap") );
+ wxCHECK_RET( m_bitmap.Ok(),
wx
T("should only be called if we have a bitmap") );
GdkBitmap *mask = (GdkBitmap *) NULL;
if ( m_bitmap.GetMask() )
GdkBitmap *mask = (GdkBitmap *) NULL;
if ( m_bitmap.GetMask() )
@@
-61,7
+61,7
@@
bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{
- wxFAIL_MSG( T("wxXX creation failed") );
+ wxFAIL_MSG(
wx
T("wxXX creation failed") );
return FALSE;
}
return FALSE;
}
@@
-69,16
+69,12
@@
bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
if (m_bitmap.Ok())
{
if (m_bitmap.Ok())
{
- wxSize newSize = size;
-
GdkBitmap *mask = (GdkBitmap *) NULL;
if ( m_bitmap.GetMask() )
mask = m_bitmap.GetMask()->GetBitmap();
m_widget = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );
GdkBitmap *mask = (GdkBitmap *) NULL;
if ( m_bitmap.GetMask() )
mask = m_bitmap.GetMask()->GetBitmap();
m_widget = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );
- if (newSize.x == -1) newSize.x = m_bitmap.GetWidth();
- if (newSize.y == -1) newSize.y = m_bitmap.GetHeight();
- SetSize( newSize.x, newSize.y );
+ SetSizeOrDefault( size );
}
else
{
}
else
{
@@
-116,8
+112,16
@@
void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
gtk_pixmap_set( GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask );
}
gtk_pixmap_set( GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask );
}
- SetSize
( m_bitmap.GetWidth(), m_bitmap.GetHeight()
);
+ SetSize
OrDefault(
);
}
}
}
}
+wxSize wxStaticBitmap::DoGetBestSize() const
+{
+ if ( m_bitmap.Ok() )
+ return wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight());
+ else
+ return wxSize(16, 16); // completely arbitrary
+}
+
#endif
#endif