projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
extracted wxSelectionStore in a separate file
[wxWidgets.git]
/
src
/
gtk
/
statbmp.cpp
diff --git
a/src/gtk/statbmp.cpp
b/src/gtk/statbmp.cpp
index 392fa2fa4c6e39422112d0cd5b4fe7b15b6f1a0b..91b5df62155b3956d524e49638ea3a6b6ba9e729 100644
(file)
--- a/
src/gtk/statbmp.cpp
+++ b/
src/gtk/statbmp.cpp
@@
-46,11
+46,13
@@
void wxStaticBitmap::CreatePixmapWidget()
mask = m_bitmap.GetMask()->GetBitmap();
m_widget = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );
mask = m_bitmap.GetMask()->GetBitmap();
m_widget = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );
- /
* insert GTK representation */
+ /
/ insert GTK representation
(*m_parent->m_insertCallback)(m_parent, this);
gtk_widget_show( m_widget );
(*m_parent->m_insertCallback)(m_parent, this);
gtk_widget_show( m_widget );
+ m_focusWidget = m_widget;
+
PostCreation();
}
PostCreation();
}
@@
-64,7
+66,7
@@
bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{
wxFAIL_MSG( wxT("wxXX creation failed") );
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{
wxFAIL_MSG( wxT("wxXX creation failed") );
-
return FALSE;
+ return FALSE;
}
m_bitmap = bitmap;
}
m_bitmap = bitmap;
@@
-81,6
+83,8
@@
bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
else
{
m_widget = gtk_label_new( "Bitmap" );
else
{
m_widget = gtk_label_new( "Bitmap" );
+
+ m_focusWidget = m_widget;
PostCreation();
}
PostCreation();
}