AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patch #1446110: use of uninitialized variables

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2006-03-09 06:27:59 +00:00
parent 8e75dca831
commit c64371deb2
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/gtk/listbox.cpp
View File

@ -144,12 +144,9 @@ gtk_listbox_row_activated_callback(GtkTreeView *treeview,
if( (((listbox->GetWindowStyleFlag() & wxLB_MULTIPLE) != 0) || if( (((listbox->GetWindowStyleFlag() & wxLB_MULTIPLE) != 0) ||
((listbox->GetWindowStyleFlag() & wxLB_EXTENDED) != 0)) ) ((listbox->GetWindowStyleFlag() & wxLB_EXTENDED) != 0)) )
{ {
//toggle the selection + send event //toggle the selection + send event
if(listbox->IsSelected( sel )) listbox->GtkSetSelection(sel, !listbox->IsSelected( sel ), FALSE);
listbox->GtkSetSelection(sel, FALSE, FALSE);
else
listbox->GtkSetSelection(sel, TRUE, FALSE);
} }
} }
} }
@ -309,10 +306,10 @@ static gboolean gtk_listitem_select_cb( GtkTreeSelection* selection,
listbox->m_blockEvent = FALSE; listbox->m_blockEvent = FALSE;
//Finally, send the wx event //Finally, send the wx event
wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
event.SetEventObject( listbox ); event.SetEventObject( listbox );
// indicate whether this is a selection or a deselection // indicate whether this is a selection or a deselection
event.SetExtraLong( 1 ); event.SetExtraLong( 1 );
event.SetInt(nIndex); event.SetInt(nIndex);
@ -325,7 +322,7 @@ static gboolean gtk_listitem_select_cb( GtkTreeSelection* selection,
else if ( listbox->HasClientUntypedData() ) else if ( listbox->HasClientUntypedData() )
event.SetClientData( gtk_tree_entry_get_userdata(entry) ); event.SetClientData( gtk_tree_entry_get_userdata(entry) );
listbox->GetEventHandler()->ProcessEvent( event ); listbox->GetEventHandler()->ProcessEvent( event );
g_object_unref(G_OBJECT(entry)); g_object_unref(G_OBJECT(entry));
return FALSE; //We handled it/did it manually return FALSE; //We handled it/did it manually
@ -1082,14 +1079,11 @@ wxSize wxListBox::DoGetBestSize() const
{ {
wxCHECK_MSG(m_treeview, wxDefaultSize, wxT("invalid tree view")); wxCHECK_MSG(m_treeview, wxDefaultSize, wxT("invalid tree view"));
int lbWidth;
int lbHeight;
// Start with a minimum size that's not too small // Start with a minimum size that's not too small
int cx, cy; int cx, cy;
GetTextExtent( wxT("X"), &cx, &cy); GetTextExtent( wxT("X"), &cx, &cy);
lbWidth += 3 * cx; int lbWidth = 3 * cx;
lbHeight += 10; int lbHeight = 10;
// Get the visible area of the tree view (limit to the 10th item // Get the visible area of the tree view (limit to the 10th item
// so that it isn't too big) // so that it isn't too big)