Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed coding of a switch statement that had RETURN statements before the BREAK statements, causing compiler warnings with BCC

Browse Source 
Initialized the temporary date variables so that if a date in the DB is corrupt, then the variables will have a default value in them.
When data sources list box is populated, if the DB specified in the .CFG file is no longer in the list, a wxASSERT() message was generated in debug builds.  Now the program makes sure that the datasource is in the listbox's choices before trying to set the selected choice to that string


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
George Tasker
2001-11-23 00:24:32 +00:00
parent ef3a5e0aae
commit f369dd4fdd
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
samples/db/dbtest.cpp
View File

@@ -438,6 +438,20 @@ bool DatabaseDemoApp::OnInit()
} // DatabaseDemoApp::OnInit() } // DatabaseDemoApp::OnInit()
/*
* Remove CR or CR/LF from a character string.
*/
char* wxRemoveLineTerminator(char* aString)
{
int len = strlen(aString);
while (len > 0 && (aString[len-1] == '\r' || aString[len-1] == '\n')) {
aString[len-1] = '\0';
len--;
}
return aString;
}
bool DatabaseDemoApp::ReadParamFile(Cparameters &params) bool DatabaseDemoApp::ReadParamFile(Cparameters &params)
{ {
FILE *paramFile; FILE *paramFile;
@@ -452,19 +466,19 @@ bool DatabaseDemoApp::ReadParamFile(Cparameters &params)
wxChar buffer[1000+1]; wxChar buffer[1000+1];
fgets(buffer, sizeof(params.ODBCSource), paramFile); fgets(buffer, sizeof(params.ODBCSource), paramFile);
buffer[wxStrlen(buffer)-1] = wxT('\0'); wxRemoveLineTerminator(buffer);
wxStrcpy(params.ODBCSource,buffer); wxStrcpy(params.ODBCSource,buffer);
fgets(buffer, sizeof(params.UserName), paramFile); fgets(buffer, sizeof(params.UserName), paramFile);
buffer[wxStrlen(buffer)-1] = wxT('\0'); wxRemoveLineTerminator(buffer);
wxStrcpy(params.UserName,buffer); wxStrcpy(params.UserName,buffer);
fgets(buffer, sizeof(params.Password), paramFile); fgets(buffer, sizeof(params.Password), paramFile);
buffer[wxStrlen(buffer)-1] = wxT('\0'); wxRemoveLineTerminator(buffer);
wxStrcpy(params.Password,buffer); wxStrcpy(params.Password,buffer);
fgets(buffer, sizeof(params.DirPath), paramFile); fgets(buffer, sizeof(params.DirPath), paramFile);
buffer[wxStrlen(buffer)-1] = wxT('\0'); wxRemoveLineTerminator(buffer);
wxStrcpy(params.DirPath,buffer); wxStrcpy(params.DirPath,buffer);
fclose(paramFile); fclose(paramFile);
@@ -1488,7 +1502,7 @@ bool CeditorDlg::GetData()
} }
bool invalid = FALSE; bool invalid = FALSE;
int mm,dd,yyyy; int mm = 1,dd = 1,yyyy = 2001;
int first, second; int first, second;
tStr = pJoinDateTxt->GetValue(); tStr = pJoinDateTxt->GetValue();
@@ -1868,7 +1882,11 @@ bool CparameterDlg::PutData()
// Fill in the fields from the params object // Fill in the fields from the params object
if (wxGetApp().params.ODBCSource && wxStrlen(wxGetApp().params.ODBCSource)) if (wxGetApp().params.ODBCSource && wxStrlen(wxGetApp().params.ODBCSource))
pParamODBCSourceList->SetStringSelection(wxGetApp().params.ODBCSource); {
int index = pParamODBCSourceList->FindString(wxGetApp().params.ODBCSource);
if (index != -1)
pParamODBCSourceList->SetSelection(index);
}
pParamUserNameTxt->SetValue(wxGetApp().params.UserName); pParamUserNameTxt->SetValue(wxGetApp().params.UserName);
pParamPasswordTxt->SetValue(wxGetApp().params.Password); pParamPasswordTxt->SetValue(wxGetApp().params.Password);
pParamDirPathTxt->SetValue(wxGetApp().params.DirPath); pParamDirPathTxt->SetValue(wxGetApp().params.DirPath);