various compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -275,7 +275,7 @@ void DBTree::OnSelChanged(wxTreeEvent& WXUNUSED(event))
|
|||||||
//-------------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------------
|
||||||
if (Temp1.Contains(_T("ODBC-")))
|
if (Temp1.Contains(_T("ODBC-")))
|
||||||
{
|
{
|
||||||
Temp1 = Temp1.Mid(5,wxSTRING_MAXLEN);
|
Temp1 = Temp1.Mid(5);
|
||||||
for (i=0;i<pDoc->i_DSN;i++)
|
for (i=0;i<pDoc->i_DSN;i++)
|
||||||
{
|
{
|
||||||
if (Temp1 == (pDoc->p_DSN+i)->Dsn)
|
if (Temp1 == (pDoc->p_DSN+i)->Dsn)
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
//----------------------------------------------------------------------------------------
|
//----------------------------------------------------------------------------------------
|
||||||
// Name: DlgUser.h,cpp
|
// Name: DlgUser.cpp
|
||||||
// Purpose: Dialog mit Variable Gestaltung durch DlgUser.wxr
|
// Purpose: Dialog mit Variable Gestaltung durch DlgUser.wxr
|
||||||
// Author: Mark Johnson
|
// Author: Mark Johnson
|
||||||
// Modified by: 19991105.mj10777
|
// Modified by: 19991105.mj10777
|
||||||
@@ -124,23 +124,13 @@ void DlgUser::OnInit()
|
|||||||
//----------------------------------------------------------------------------------------
|
//----------------------------------------------------------------------------------------
|
||||||
BEGIN_EVENT_TABLE(DlgUser, wxDialog)
|
BEGIN_EVENT_TABLE(DlgUser, wxDialog)
|
||||||
EVT_BUTTON(wxID_OK, DlgUser::OnOk)
|
EVT_BUTTON(wxID_OK, DlgUser::OnOk)
|
||||||
EVT_BUTTON(wxID_CANCEL, DlgUser::OnCancel)
|
|
||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
|
|
||||||
//----------------------------------------------------------------------------------------
|
//----------------------------------------------------------------------------------------
|
||||||
void DlgUser::OnOk(wxCommandEvent& WXUNUSED(event) )
|
void DlgUser::OnOk(wxCommandEvent& WXUNUSED(event) )
|
||||||
{
|
{
|
||||||
//canceled = false;
|
|
||||||
s_User = m_UserName->GetValue();
|
s_User = m_UserName->GetValue();
|
||||||
s_Password = m_Password->GetValue();
|
s_Password = m_Password->GetValue();
|
||||||
EndModal(wxID_OK);
|
EndModal(wxID_OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------------------------------
|
|
||||||
//void DlgUser::OnCancel(wxCommandEvent& WXUNUSED(event) )
|
|
||||||
// {
|
|
||||||
// canceled = true;
|
|
||||||
// EndModal(wxID_CANCEL);
|
|
||||||
// }
|
|
||||||
//----------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
|
@@ -169,7 +169,7 @@ void PgmCtrl::OnSelChanged(wxMouseEvent& WXUNUSED(event))
|
|||||||
//--------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------
|
||||||
if (Temp1.Contains(_T("ODBC-")))
|
if (Temp1.Contains(_T("ODBC-")))
|
||||||
{
|
{
|
||||||
Temp1 = Temp1.Mid(5,wxSTRING_MAXLEN);
|
Temp1 = Temp1.Mid(5);
|
||||||
for (i=0;i<pDoc->i_DSN;i++)
|
for (i=0;i<pDoc->i_DSN;i++)
|
||||||
{
|
{
|
||||||
if (Temp1 == (pDoc->p_DSN+i)->Dsn)
|
if (Temp1 == (pDoc->p_DSN+i)->Dsn)
|
||||||
@@ -213,7 +213,7 @@ void PgmCtrl::OnRightSelect(wxTreeEvent& WXUNUSED(event))
|
|||||||
//--------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------
|
||||||
if (Temp1.Contains(_T("ODBC-")))
|
if (Temp1.Contains(_T("ODBC-")))
|
||||||
{
|
{
|
||||||
Temp1 = Temp1.Mid(5,wxSTRING_MAXLEN);
|
Temp1 = Temp1.Mid(5);
|
||||||
for (i=0;i<pDoc->i_DSN;i++)
|
for (i=0;i<pDoc->i_DSN;i++)
|
||||||
{
|
{
|
||||||
if (Temp1 == (pDoc->p_DSN+i)->Dsn)
|
if (Temp1 == (pDoc->p_DSN+i)->Dsn)
|
||||||
|
Reference in New Issue
Block a user