Patch for stream.cpp for non-flushable stream,
Corrected stream corruption for Umgetch()/SeekI() conflict, Docs for streams, Changed interpreteation og non-standard height in wxCombo, Other minor changes, Removed library name setting for Debian again. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -101,7 +101,15 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
|
||||
m_needParent = TRUE;
|
||||
m_acceptsFocus = TRUE;
|
||||
|
||||
if (!PreCreation( parent, pos, size ) ||
|
||||
wxSize newSize( size );
|
||||
if (newSize.x == -1)
|
||||
newSize.x = 80;
|
||||
if (newSize.y == -1)
|
||||
newSize.y = 26;
|
||||
if (newSize.y > 30)
|
||||
newSize.y = 30;
|
||||
|
||||
if (!PreCreation( parent, pos, newSize ) ||
|
||||
!CreateBase( parent, id, pos, size, style, validator, name ))
|
||||
{
|
||||
wxFAIL_MSG( wxT("wxComboBox creation failed") );
|
||||
@@ -113,8 +121,6 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
|
||||
// make it more useable
|
||||
gtk_combo_set_use_arrows_always(GTK_COMBO(m_widget), TRUE);
|
||||
|
||||
SetSizeOrDefault( size );
|
||||
|
||||
GtkWidget *list = GTK_COMBO(m_widget)->list;
|
||||
|
||||
for (int i = 0; i < n; i++)
|
||||
|
Reference in New Issue
Block a user