Added validation support
Fixed a few minor things in wxGrid
Fixed bug in SetClippingregion
Disabled SetDefault again
Fixed bug in AddChild, SetSize et al.
Add PROCESS_ENTER and wxEVT_TEXT_CHANGE
Renamed OnOk -> OnOK
Added a few compatibilty functions
Added code to make iinterception
of events possible and work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -91,7 +91,10 @@ bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &b
|
||||
|
||||
void wxBitmapButton::SetDefault(void)
|
||||
{
|
||||
/*
|
||||
GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
|
||||
gtk_widget_grab_default( m_widget );
|
||||
*/
|
||||
}
|
||||
|
||||
void wxBitmapButton::SetLabel( const wxString &label )
|
||||
@@ -103,3 +106,21 @@ wxString wxBitmapButton::GetLabel(void) const
|
||||
{
|
||||
return wxControl::GetLabel();
|
||||
}
|
||||
|
||||
void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap )
|
||||
{
|
||||
m_bitmap = bitmap;
|
||||
if (!m_bitmap.Ok()) return;
|
||||
|
||||
GtkButton *bin = GTK_BUTTON( m_widget );
|
||||
GtkPixmap *g_pixmap = GTK_PIXMAP( bin->child );
|
||||
|
||||
GdkBitmap *mask = NULL;
|
||||
if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap();
|
||||
|
||||
gtk_pixmap_set( g_pixmap, m_bitmap.GetPixmap(), mask );
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user