A few compile things.
Changed resizing of multi-line text ctrl. Augmented beta version to 8. Distribution things. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -148,14 +148,14 @@ bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
|
||||
|
||||
gtk_widget_show( pixmap );
|
||||
gtk_container_add( GTK_CONTAINER(m_widget), pixmap );
|
||||
|
||||
int border = 10;
|
||||
if (style & wxNO_BORDER) border = 4;
|
||||
if (newSize.x == -1) newSize.x = m_bitmap.GetWidth()+border;
|
||||
if (newSize.y == -1) newSize.y = m_bitmap.GetHeight()+border;
|
||||
SetSize( newSize.x, newSize.y );
|
||||
}
|
||||
|
||||
int border = 10;
|
||||
if (style & wxNO_BORDER) border = 4;
|
||||
if (newSize.x == -1) newSize.x = m_bitmap.GetWidth()+border;
|
||||
if (newSize.y == -1) newSize.y = m_bitmap.GetHeight()+border;
|
||||
SetSize( newSize.x, newSize.y );
|
||||
|
||||
gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
|
||||
GTK_SIGNAL_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this );
|
||||
|
||||
|
Reference in New Issue
Block a user