projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
code
[wxWidgets.git]
/
src
/
gtk1
/
statbmp.cpp
diff --git
a/src/gtk1/statbmp.cpp
b/src/gtk1/statbmp.cpp
index 186947afb2edc9808db3b90740d0a4715f788b2a..91b5df62155b3956d524e49638ea3a6b6ba9e729 100644
(file)
--- a/
src/gtk1/statbmp.cpp
+++ b/
src/gtk1/statbmp.cpp
@@
-11,10
+11,12
@@
#pragma implementation "statbmp.h"
#endif
#pragma implementation "statbmp.h"
#endif
-#include "wx/
statbmp
.h"
+#include "wx/
defs
.h"
#if wxUSE_STATBMP
#if wxUSE_STATBMP
+#include "wx/statbmp.h"
+
#include "gdk/gdk.h"
#include "gtk/gtk.h"
#include "gdk/gdk.h"
#include "gtk/gtk.h"
@@
-37,18
+39,20
@@
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() )
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 );
- /
* 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();
}
@@
-61,28
+65,26
@@
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") );
-
return FALSE;
+ wxFAIL_MSG(
wx
T("wxXX creation failed") );
+ return FALSE;
}
m_bitmap = bitmap;
if (m_bitmap.Ok())
{
}
m_bitmap = bitmap;
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 );
+ SetBestSize( size );
}
else
{
m_widget = gtk_label_new( "Bitmap" );
}
else
{
m_widget = gtk_label_new( "Bitmap" );
+
+ m_focusWidget = m_widget;
PostCreation();
}
PostCreation();
}
@@
-116,8
+118,9
@@
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 );
}
- Set
Size( m_bitmap.GetWidth(), m_bitmap.GetHeight()
);
+ Set
BestSize(wxSize(bitmap.GetWidth(), bitmap.GetHeight())
);
}
}
}
}
-#endif
+#endif // wxUSE_STATBMP
+