Added header vs. library version check to configure,

Fixed problem in wxTreeCtrl when nothing was selected
   upon startup and tabbing into it crashed.
 I understood now what filterindex in file dialog means.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-11-15 19:35:10 +00:00
parent ef30972aed
commit f49f2b0c33
4 changed files with 306 additions and 285 deletions

522
configure vendored

File diff suppressed because it is too large Load Diff

View File

@@ -49,6 +49,7 @@ dnl checks the results of gtk-config to some extent)
dnl dnl
AC_TRY_RUN([ AC_TRY_RUN([
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gtk/gtkfeatures.h>
#include <stdio.h> #include <stdio.h>
int int
@@ -61,6 +62,13 @@ main ()
exit(1); exit(1);
} }
if ((GTK_MAJOR_VERSION != gtk_major_version) ||
(GTK_MINOR_VERSION != gtk_minor_version) ||
(GTK_MICRO_VERSION != gtk_micro_version)) {
printf("Headers vs. library version mismatch!\n");
exit(1);
}
if (gtk_minor_version == 1) return FALSE; if (gtk_minor_version == 1) return FALSE;
return !((gtk_major_version > major) || return !((gtk_major_version > major) ||

View File

@@ -709,6 +709,7 @@ void wxFileDialog::OnChoice( wxCommandEvent &event )
{ {
wxString *str = (wxString*) m_choice->GetClientData( event.GetInt() ); wxString *str = (wxString*) m_choice->GetClientData( event.GetInt() );
m_list->SetWild( *str ); m_list->SetWild( *str );
m_filterIndex = event.GetInt();
} }
void wxFileDialog::OnCheck( wxCommandEvent &event ) void wxFileDialog::OnCheck( wxCommandEvent &event )

View File

@@ -843,10 +843,8 @@ wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parentId,
} }
wxClientDC dc(this); wxClientDC dc(this);
wxGenericTreeItem *item = new wxGenericTreeItem(parent, wxGenericTreeItem *item =
text, dc, new wxGenericTreeItem( parent, text, dc, image, selImage, data );
image, selImage,
data);
if ( data != NULL ) if ( data != NULL )
{ {
@@ -874,6 +872,12 @@ wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,
data->m_pItem = m_anchor; data->m_pItem = m_anchor;
} }
if (!HasFlag(wxTR_MULTIPLE))
{
m_current = m_key_current = m_anchor;
m_current->SetHilight( TRUE );
}
Refresh(); Refresh();
AdjustMyScrollbars(); AdjustMyScrollbars();