1. wxCalendarCtrl
2. several wxDateTime bugs corrected, a couple of missing functions added 3. GetBestSize() corrections for several wxGTK controls 4. wxStaticLine doesn't get focus any more under MSW 5. added DoMoveWindow() to wxMotif git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -101,19 +101,21 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
|
||||
m_needParent = TRUE;
|
||||
m_acceptsFocus = TRUE;
|
||||
|
||||
wxSize newSize( size );
|
||||
wxSize newSize = size,
|
||||
bestSize = DoGetBestSize();
|
||||
|
||||
if (newSize.x == -1)
|
||||
newSize.x = 80;
|
||||
newSize.x = bestSize.x;
|
||||
if (newSize.y == -1)
|
||||
newSize.y = 26;
|
||||
newSize.y = bestSize.y;
|
||||
if (newSize.y > 30)
|
||||
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") );
|
||||
return FALSE;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
m_widget = gtk_combo_new();
|
||||
@@ -126,7 +128,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
|
||||
for (int i = 0; i < n; i++)
|
||||
{
|
||||
/* don't send first event, which GTK sends aways when
|
||||
inserting the first item */
|
||||
inserting the first item */
|
||||
m_alreadySent = TRUE;
|
||||
|
||||
GtkWidget *list_item = gtk_list_item_new_with_label( choices[i].mbc_str() );
|
||||
@@ -663,6 +665,7 @@ bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
|
||||
|
||||
wxSize wxComboBox::DoGetBestSize() const
|
||||
{
|
||||
// totally bogus - should measure the strings in the combo!
|
||||
return wxSize(100, 26);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user