diff -u -r LDAPExplorerTool-0.5/src/LDAPBrowser_PreferencesDialog.cpp LDAPExplorerTool-0.5-patch/src/LDAPBrowser_PreferencesDialog.cpp --- LDAPExplorerTool-0.5/src/LDAPBrowser_PreferencesDialog.cpp Thu Jul 17 09:16:22 2003 +++ LDAPExplorerTool-0.5-patch/src/LDAPBrowser_PreferencesDialog.cpp Tue Aug 12 14:30:35 2003 @@ -58,14 +58,26 @@ //wxConfigBase *Conf = wxConfigBase::Get(); wxConfig *Conf = new wxConfig( PACKAGE ); - wxXmlResource::Get()->LoadDialog( this, parent, "preferences_dialog" ); + if(!(wxXmlResource::Get()->LoadDialog( this, parent, "preferences_dialog" ))) + { + Create(parent, -1, "Preferences"); + } m_Language = ( wxChoice * ) FindWindowByName( "preferences_language", this ); + if(!m_Language) + { + printf("Trouble inititializing m_Language\n"); + } m_SearchSizeLimit = ( wxTextCtrl * ) FindWindowByName( "preferences_search_size", this ); + if(!m_SearchSizeLimit) + { + printf("Trouble inititializing m_SearchSizeLimit\n"); + } // Fill the controls with values - for ( unsigned int i = 0; i < m_LanguageStrings.size(); i++ ) - { + if(m_Language) + for ( unsigned int i = 0; i < m_LanguageStrings.size(); i++ ) + { m_Language->Append( m_LanguageStrings[i].c_str(), &m_LanguageCodes[i] ); } @@ -73,7 +85,8 @@ int curLangIndex, curLangCode; curLangCode = Conf->Read( "Lang", wxLANGUAGE_DEFAULT ); curLangIndex = GetLanguageIndexFromCode( curLangCode ); - m_Language->SetSelection( curLangIndex ); + if(m_Language) + m_Language->SetSelection( curLangIndex ); int SizeLimit ; char StrSizeLimit[ 10 ] ; @@ -82,8 +95,8 @@ sprintf( StrSizeLimit, "%d", SizeLimit ); - - m_SearchSizeLimit->SetValue( StrSizeLimit ); + if(m_SearchSizeLimit) + m_SearchSizeLimit->SetValue( StrSizeLimit ); delete Conf ; }