]> git.saurik.com Git - wxWidgets.git/blobdiff - demos/dbbrowse/pgmctrl.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
doc.cpp
[wxWidgets.git] / demos / dbbrowse / pgmctrl.cpp
diff --git a/demos/dbbrowse/pgmctrl.cpp b/demos/dbbrowse/pgmctrl.cpp
index 2c03f3d3c1af50d0a28961bee39c358af4ed2ad1..6e479b587a64296177dd8ee01cad20bc53e6d18e 100644 (file)
--- a/demos/dbbrowse/pgmctrl.cpp
+++ b/demos/dbbrowse/pgmctrl.cpp
@@ -1,75 +1,72 @@
-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 // Name:        pgmctrl.h
 // Purpose:     Programm Control with a Tree
 // Author:      Mark Johnson
 // Modified by: 19990806.mj10777
 // Created:     19991010
 // Name:        pgmctrl.h
 // Purpose:     Programm Control with a Tree
 // Author:      Mark Johnson
 // Modified by: 19990806.mj10777
 // Created:     19991010
-// RCS-ID:
+// RCS-ID:      $Id$
 // Copyright:   (c) Mark Johnson, Berlin Germany, mj10777@gmx.net
 // Licence:     wxWindows license
 // Copyright:   (c) Mark Johnson, Berlin Germany, mj10777@gmx.net
 // Licence:     wxWindows license
-//---------------------------------------------------------------------------
-//-- all #ifdefs that the whole Project needs. ------------------------------
-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
+//-- all #ifdefs that the whole Project needs. -------------------------------------------
+//----------------------------------------------------------------------------------------
 #ifdef __GNUG__
 #ifdef __GNUG__
- #pragma implementation
- #pragma interface
+#pragma implementation
+#pragma interface
 #endif
 #endif
-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 #ifdef __BORLANDC__
 #ifdef __BORLANDC__
- #pragma hdrstop
+#pragma hdrstop
 #endif
 #endif
-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP
- #include "wx/wx.h"
+#include "wx/wx.h"
 #endif
 #endif
-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 #ifndef __WXMSW__
 #ifndef __WXMSW__
- #include "bitmaps/d_closed.xpm"
- #include "bitmaps/d_open.xpm"
- #include "bitmaps/f_closed.xpm"
- #include "bitmaps/f_open.xpm"
- #include "bitmaps/logo.xpm"
- #include "bitmaps/dsnclose.xpm"
- #include "bitmaps/dsnopen.xpm"
+#include "bitmaps/d_closed.xpm"
+#include "bitmaps/d_open.xpm"
+#include "bitmaps/f_closed.xpm"
+#include "bitmaps/f_open.xpm"
+#include "bitmaps/logo.xpm"
+#include "bitmaps/dsnclose.xpm"
+#include "bitmaps/dsnopen.xpm"
 #endif
 #endif
-//---------------------------------------------------------------------------
-//-- all #includes that every .cpp needs             --- 19990807.mj10777 ---
-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
+//-- all #includes that every .cpp needs             --- 19990807.mj10777 ----------------
+//----------------------------------------------------------------------------------------
 #include "std.h"    // sorgsam Pflegen !
 #include "std.h"    // sorgsam Pflegen !
-//---------------------------------------------------------------------------
-//-- Global functions -------------------------------------------------------
-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
+//-- Global functions --------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 static inline const char *bool2String(bool b)
 {
 static inline const char *bool2String(bool b)
 {
- return b ? "" : "not ";
+  return b ? "" : "not ";
 }
 }
-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 BEGIN_EVENT_TABLE(PgmCtrl, wxTreeCtrl)
   EVT_MOTION (PgmCtrl::OnMouseMove)
   EVT_LEFT_DCLICK(PgmCtrl::OnSelChanged)
   EVT_TREE_ITEM_RIGHT_CLICK(TREE_CTRL_PGM,PgmCtrl::OnRightSelect)
   EVT_MENU(PGMCTRL_ODBC_USER,PgmCtrl::OnUserPassword)
 END_EVENT_TABLE()
 BEGIN_EVENT_TABLE(PgmCtrl, wxTreeCtrl)
   EVT_MOTION (PgmCtrl::OnMouseMove)
   EVT_LEFT_DCLICK(PgmCtrl::OnSelChanged)
   EVT_TREE_ITEM_RIGHT_CLICK(TREE_CTRL_PGM,PgmCtrl::OnRightSelect)
   EVT_MENU(PGMCTRL_ODBC_USER,PgmCtrl::OnUserPassword)
 END_EVENT_TABLE()
-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 // PgmCtrl implementation
 // PgmCtrl implementation
-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 IMPLEMENT_DYNAMIC_CLASS(PgmCtrl, wxTreeCtrl)
 IMPLEMENT_DYNAMIC_CLASS(PgmCtrl, wxTreeCtrl)
-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 PgmCtrl::PgmCtrl(wxWindow *parent) : wxTreeCtrl(parent)
 {
 }
 PgmCtrl::PgmCtrl(wxWindow *parent) : wxTreeCtrl(parent)
 {
 }
+//----------------------------------------------------------------------------------------
 PgmCtrl::PgmCtrl(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const wxSize& size, long style)
 PgmCtrl::PgmCtrl(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const wxSize& size, long style)
-          : wxTreeCtrl(parent, id, pos, size, style)
+  : wxTreeCtrl(parent, id, pos, size, style)
 {
 {
- wxFont* ft_Temp = new wxFont(10,wxSWISS,wxNORMAL,wxBOLD,FALSE,"Comic Sans MS");
- SetFont(* ft_Temp);
-
  // Make an image list containing small icons
  p_imageListNormal = new wxImageList(16, 16, TRUE);
  // Make an image list containing small icons
  p_imageListNormal = new wxImageList(16, 16, TRUE);
-
  // should correspond to TreeIc_xxx enum
 #if defined(__WXMSW__) && defined(__WIN16__)
  // This is required in 16-bit Windows mode only because we can't load a specific (16x16)
  // should correspond to TreeIc_xxx enum
 #if defined(__WXMSW__) && defined(__WIN16__)
  // This is required in 16-bit Windows mode only because we can't load a specific (16x16)
@@ -77,7 +74,7 @@ PgmCtrl::PgmCtrl(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const
  p_imageListNormal->Add(wxBitmap("bitmap1", wxBITMAP_TYPE_BMP_RESOURCE));
  p_imageListNormal->Add(wxBitmap("bitmap2", wxBITMAP_TYPE_BMP_RESOURCE));
 #else
  p_imageListNormal->Add(wxBitmap("bitmap1", wxBITMAP_TYPE_BMP_RESOURCE));
  p_imageListNormal->Add(wxBitmap("bitmap2", wxBITMAP_TYPE_BMP_RESOURCE));
 #else
- p_imageListNormal->Add(wxICON(Logo));
+ p_imageListNormal->Add(wxICON(aLogo));
  p_imageListNormal->Add(wxICON(DsnClosed));
  p_imageListNormal->Add(wxICON(DsnOpen));
  p_imageListNormal->Add(wxICON(DocClosed));
  p_imageListNormal->Add(wxICON(DsnClosed));
  p_imageListNormal->Add(wxICON(DsnOpen));
  p_imageListNormal->Add(wxICON(DocClosed));
@@ -85,59 +82,53 @@ PgmCtrl::PgmCtrl(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const
  p_imageListNormal->Add(wxICON(FolderClosed));
  p_imageListNormal->Add(wxICON(FolderOpen));
 #endif
  p_imageListNormal->Add(wxICON(FolderClosed));
  p_imageListNormal->Add(wxICON(FolderOpen));
 #endif
-
  SetImageList(p_imageListNormal);
  SetImageList(p_imageListNormal);
-
- // Add some items to the tree
- // AddTestItemsToTree(3, 2);
 }
 }
-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 PgmCtrl::~PgmCtrl()
 {
 PgmCtrl::~PgmCtrl()
 {
- // wxMessageBox("PgmCtrl::~PgmCtrl() - vor  DeleteAllItems");
- // DeleteAllItems();
- // wxMessageBox("nach DeleteAllItems");
  delete p_imageListNormal;
 }
  delete p_imageListNormal;
 }
-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 #undef TREE_EVENT_HANDLER
 #undef TREE_EVENT_HANDLER
-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 int  PgmCtrl::OnPopulate()
 {
 int  PgmCtrl::OnPopulate()
 {
+ SetFont(* pDoc->ft_Doc);
  wxTreeItemId Root, Folder, Docu;
  wxTreeItemId Root, Folder, Docu;
- //----------------------------------------------------------------------------------------------------------------------------
+ //---------------------------------------------------------------------------------------
  int i;
  double dTmp = 1234567.89;
  Temp0.Printf(_("%s Functions"),p_ProgramCfg->GetAppName().c_str());
  Root   = AddRoot(Temp0,TreeIc_Logo,TreeIc_Logo, new TreeData("Root"));
  int i;
  double dTmp = 1234567.89;
  Temp0.Printf(_("%s Functions"),p_ProgramCfg->GetAppName().c_str());
  Root   = AddRoot(Temp0,TreeIc_Logo,TreeIc_Logo, new TreeData("Root"));
- //----------------------------------------------------------------------------------------------------------------------------
+ //---------------------------------------------------------------------------------------
  Folder = AppendItem(Root, _("Program settings")   ,TreeIc_FolderClosed, TreeIc_FolderOpen, new TreeData("Settings"));
  p_ProgramCfg->Read("/Local/langid",&Temp0); p_ProgramCfg->Read("/Local/language",&Temp2);
  Temp1.Printf(_("locale (%s) ; Language (%s) ; Number(%2.2f)"),Temp0.c_str(), Temp2.c_str(), dTmp); Temp0.Empty();  Temp2.Empty();
  Folder = AppendItem(Root, _("Program settings")   ,TreeIc_FolderClosed, TreeIc_FolderOpen, new TreeData("Settings"));
  p_ProgramCfg->Read("/Local/langid",&Temp0); p_ProgramCfg->Read("/Local/language",&Temp2);
  Temp1.Printf(_("locale (%s) ; Language (%s) ; Number(%2.2f)"),Temp0.c_str(), Temp2.c_str(), dTmp); Temp0.Empty();  Temp2.Empty();
- Docu   = AppendItem(Folder, Temp1                 ,TreeIc_DocClosed,          TreeIc_DocOpen,          new TreeData("Setting Language"));
+ Docu   = AppendItem(Folder, Temp1,TreeIc_DocClosed,TreeIc_DocOpen,new TreeData("Setting Language"));
  p_ProgramCfg->Read("/Paths/Work",&Temp0); Temp1.Printf(_("Work Path : %s"),Temp0.c_str()); Temp0.Empty();
  p_ProgramCfg->Read("/Paths/Work",&Temp0); Temp1.Printf(_("Work Path : %s"),Temp0.c_str()); Temp0.Empty();
- Docu   = AppendItem(Folder, Temp1                 ,TreeIc_DocClosed,          TreeIc_DocOpen,          new TreeData("Path Work"));
- Docu   = AppendItem(Folder, _("Change the language to English") ,TreeIc_DocClosed,          TreeIc_DocOpen,          new TreeData("Language English"));
- Docu   = AppendItem(Folder, _("Change the language to German")  ,TreeIc_DocClosed,          TreeIc_DocOpen,          new TreeData("Language German"));
- Docu   = AppendItem(Folder, _("Delete all wxConfigBase Entry's"),TreeIc_DocClosed,          TreeIc_DocOpen,          new TreeData("wxConfigBase Delete"));
- Folder = AppendItem(Root, "ODBC DSN"  ,TreeIc_FolderClosed, TreeIc_FolderOpen, new TreeData("ODBC-DSN"));
+ Docu   = AppendItem(Folder,Temp1,TreeIc_DocClosed,TreeIc_DocOpen,new TreeData("Path Work"));
+ Docu   = AppendItem(Folder, _("Change the language to English") ,TreeIc_DocClosed,TreeIc_DocOpen,new TreeData("Language English"));
+ Docu   = AppendItem(Folder, _("Change the language to German")  ,TreeIc_DocClosed,TreeIc_DocOpen,new TreeData("Language German"));
+ Docu   = AppendItem(Folder, _("Delete all wxConfigBase Entry's"),TreeIc_DocClosed,TreeIc_DocOpen,new TreeData("wxConfigBase Delete"));
+ Folder = AppendItem(Root, "ODBC DSN",TreeIc_FolderClosed,TreeIc_FolderOpen,new TreeData("ODBC-DSN"));
  for (i=0;i<pDoc->i_DSN;i++)
  {
   Temp0.Printf("ODBC-%s",(pDoc->p_DSN+i)->Dsn.c_str());
   Docu   = AppendItem(Folder,(pDoc->p_DSN+i)->Dsn ,TreeIc_DsnClosed,TreeIc_DsnOpen, new TreeData(Temp0));
  }
  for (i=0;i<pDoc->i_DSN;i++)
  {
   Temp0.Printf("ODBC-%s",(pDoc->p_DSN+i)->Dsn.c_str());
   Docu   = AppendItem(Folder,(pDoc->p_DSN+i)->Dsn ,TreeIc_DsnClosed,TreeIc_DsnOpen, new TreeData(Temp0));
  }
- //----------------------------------------------------------------------------------------------------------------------------
+ //---------------------------------------------------------------------------------------
  popupMenu1 = NULL;
  popupMenu1 = new wxMenu("");
  popupMenu1->Append(PGMCTRL_ODBC_USER, _("Set Username and Password"));
  // popupMenu1->AppendSeparator();
  popupMenu1 = NULL;
  popupMenu1 = new wxMenu("");
  popupMenu1->Append(PGMCTRL_ODBC_USER, _("Set Username and Password"));
  // popupMenu1->AppendSeparator();
- //----------------------------------------------------------------------------------------------------------------------------
+ //---------------------------------------------------------------------------------------
  Expand(Root);
  Expand(Folder);
  Expand(Root);
  Expand(Folder);
- //----------------------------------------------------------------------------------------------------------------------------
- return 0;
+ //---------------------------------------------------------------------------------------
+  return 0;
 }
 }
-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 void PgmCtrl::OnSelChanged(wxTreeEvent& WXUNUSED(event))
 {
  int i;
 void PgmCtrl::OnSelChanged(wxTreeEvent& WXUNUSED(event))
 {
  int i;
@@ -146,11 +137,11 @@ void PgmCtrl::OnSelChanged(wxTreeEvent& WXUNUSED(event))
  // Get the Information that we need
  wxTreeItemId itemId = GetSelection();
  TreeData *item = (TreeData *)GetItemData(itemId);
  // Get the Information that we need
  wxTreeItemId itemId = GetSelection();
  TreeData *item = (TreeData *)GetItemData(itemId);
- if ( item != NULL )
+ if (item != NULL )
  {
   int Treffer = 0;
   Temp1.Printf("%s",item->m_desc.c_str());
  {
   int Treffer = 0;
   Temp1.Printf("%s",item->m_desc.c_str());
-  //-----------------------------------------------------------------------------------------
+  //--------------------------------------------------------------------------------------
   if (Temp1 == "Language English")
   {
    Temp0 = "std";
   if (Temp1 == "Language English")
   {
    Temp0 = "std";
@@ -165,7 +156,7 @@ void PgmCtrl::OnSelChanged(wxTreeEvent& WXUNUSED(event))
    Temp0 = _("-I-> After a programm restart, the language will be changed to German.");
    wxMessageBox(Temp0);
   }
    Temp0 = _("-I-> After a programm restart, the language will be changed to German.");
    wxMessageBox(Temp0);
   }
-  //-----------------------------------------------------------------------------------------
+  //--------------------------------------------------------------------------------------
   if (Temp1 == "wxConfigBase Delete")
   {
    if (p_ProgramCfg->DeleteAll()) // Default Diretory for wxFileSelector
   if (Temp1 == "wxConfigBase Delete")
   {
    if (p_ProgramCfg->DeleteAll()) // Default Diretory for wxFileSelector
@@ -175,7 +166,7 @@ void PgmCtrl::OnSelChanged(wxTreeEvent& WXUNUSED(event))
    wxBell();     // Ding_a_Ling
    Treffer++;
   }
    wxBell();     // Ding_a_Ling
    Treffer++;
   }
-  //-----------------------------------------------------------------------------------------
+  //--------------------------------------------------------------------------------------
   if (Temp1.Contains("ODBC-"))
   {
    Temp1 = Temp1.Mid(5,wxSTRING_MAXLEN);
   if (Temp1.Contains("ODBC-"))
   {
    Temp1 = Temp1.Mid(5,wxSTRING_MAXLEN);
@@ -188,25 +179,25 @@ void PgmCtrl::OnSelChanged(wxTreeEvent& WXUNUSED(event))
    }
    Treffer++;
   }
    }
    Treffer++;
   }
-  //-----------------------------------------------------------------------------------------
+  //--------------------------------------------------------------------------------------
   if (Treffer == 0)
   {
   if (Treffer == 0)
   {
-   //---------------------------------------------------
+   //-------------------------------------------------------------------------------------
    Temp0.Printf(_("Item '%s': %sselected, %sexpanded, %sbold,"
    Temp0.Printf(_("Item '%s': %sselected, %sexpanded, %sbold,"
-                "%u children (%u immediately under this item)."),
-                item->m_desc.c_str(),
-                bool2String(IsSelected(itemId)),
-                bool2String(IsExpanded(itemId)),
-                bool2String(IsBold(itemId)),
-                GetChildrenCount(itemId),
-                GetChildrenCount(itemId));
+                 "%u children (%u immediately under this item)."),
+          item->m_desc.c_str(),
+          bool2String(IsSelected(itemId)),
+          bool2String(IsExpanded(itemId)),
+          bool2String(IsBold(itemId)),
+          GetChildrenCount(itemId),
+          GetChildrenCount(itemId));
    LogBuf.Printf("-I-> PgmCtrl::OnSelChanged - %s",Temp0.c_str());
    wxLogMessage( "%s", LogBuf.c_str() );
    LogBuf.Printf("-I-> PgmCtrl::OnSelChanged - %s",Temp0.c_str());
    wxLogMessage( "%s", LogBuf.c_str() );
-   //---------------------------------------------------
+   //-------------------------------------------------------------------------------------
   }
  }
 }
   }
  }
 }
-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 void PgmCtrl::OnRightSelect(wxTreeEvent& WXUNUSED(event))
 {
  int i;
 void PgmCtrl::OnRightSelect(wxTreeEvent& WXUNUSED(event))
 {
  int i;
@@ -219,7 +210,7 @@ void PgmCtrl::OnRightSelect(wxTreeEvent& WXUNUSED(event))
  {
   int Treffer = 0;
   Temp1.Printf("%s",item->m_desc.c_str());
  {
   int Treffer = 0;
   Temp1.Printf("%s",item->m_desc.c_str());
-  //-----------------------------------------------------------------------------------------
+  //--------------------------------------------------------------------------------------
   if (Temp1.Contains("ODBC-"))
   {
    Temp1 = Temp1.Mid(5,wxSTRING_MAXLEN);
   if (Temp1.Contains("ODBC-"))
   {
    Temp1 = Temp1.Mid(5,wxSTRING_MAXLEN);
@@ -233,64 +224,67 @@ void PgmCtrl::OnRightSelect(wxTreeEvent& WXUNUSED(event))
    }
    Treffer++;
   }
    }
    Treffer++;
   }
-  //-----------------------------------------------------------------------------------------
+  //--------------------------------------------------------------------------------------
   if (Treffer == 0)
   {
   if (Treffer == 0)
   {
-   //---------------------------------------------------
    /*
    /*
-   Temp0.Printf(_("Item '%s': %sselected, %sexpanded, %sbold,"
-                "%u children (%u immediately under this item)."),
-                item->m_desc.c_str(),
-                bool2String(IsSelected(itemId)),
-                bool2String(IsExpanded(itemId)),
+     Temp0.Printf(_("Item '%s': %sselected, %sexpanded, %sbold,"
+     "%u children (%u immediately under this item)."),
+     item->m_desc.c_str(),
+     bool2String(IsSelected(itemId)),
+     bool2String(IsExpanded(itemId)),
                 bool2String(IsBold(itemId)),
                 GetChildrenCount(itemId),
                 GetChildrenCount(itemId));
    LogBuf.Printf("-I-> DBTree::OnSelChanged - %s",Temp0.c_str());
    wxLogMessage( "%s", LogBuf.c_str() );
    */
                 bool2String(IsBold(itemId)),
                 GetChildrenCount(itemId),
                 GetChildrenCount(itemId));
    LogBuf.Printf("-I-> DBTree::OnSelChanged - %s",Temp0.c_str());
    wxLogMessage( "%s", LogBuf.c_str() );
    */
-   //---------------------------------------------------
   }
   }
+  //--------------------------------------------------------------------------------------
  }
 }
  }
 }
-//------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 void PgmCtrl::OnMouseMove(wxMouseEvent &event)
 {
  TreePos = event.GetPosition();
 }
 void PgmCtrl::OnMouseMove(wxMouseEvent &event)
 {
  TreePos = event.GetPosition();
 }
-//------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 void PgmCtrl::OnUserPassword()
 {
  // wxMessageBox(SaveDSN);
 void PgmCtrl::OnUserPassword()
 {
  // wxMessageBox(SaveDSN);
- int i, rc=0;
- //-------------------------------------------
- DlgUser p_Dlg(this, "Username and Password", wxPoint(100, 100), wxSize(340, 170));
+ int i;
+ //--------------------------------------------
+ DlgUser *p_Dlg = new DlgUser(this,pDoc,"");
  //-------------------------------------------
  for (i=0;i<pDoc->i_DSN;i++)
  {
   if (SaveDSN == (pDoc->p_DSN+i)->Dsn)
   {
  //-------------------------------------------
  for (i=0;i<pDoc->i_DSN;i++)
  {
   if (SaveDSN == (pDoc->p_DSN+i)->Dsn)
   {
-   p_Dlg.s_DSN      = (pDoc->p_DSN+i)->Dsn;
-   p_Dlg.s_User     = (pDoc->p_DSN+i)->Usr;
-   p_Dlg.s_Password = (pDoc->p_DSN+i)->Pas;
-   p_Dlg.OnInit();
+   p_Dlg->pDoc       = pDoc;
+   p_Dlg->s_DSN      = (pDoc->p_DSN+i)->Dsn;
+   p_Dlg->s_User     = (pDoc->p_DSN+i)->Usr;
+   p_Dlg->s_Password = (pDoc->p_DSN+i)->Pas;
+   p_Dlg->OnInit();
+   p_Dlg->Fit();
    //--------------------
    // Temp0.Printf("i(%d) ; s_DSN(%s) ; s_User(%s) ; s_Password(%s)",i,p_Dlg.s_DSN,p_Dlg.s_User,p_Dlg.s_Password);
    // wxMessageBox(Temp0);
    //--------------------
    // Temp0.Printf("i(%d) ; s_DSN(%s) ; s_User(%s) ; s_Password(%s)",i,p_Dlg.s_DSN,p_Dlg.s_User,p_Dlg.s_Password);
    // wxMessageBox(Temp0);
-   if (p_Dlg.ShowModal() == wxID_OK)
+   bool OK = FALSE;
+   if (p_Dlg->ShowModal() == wxID_OK)
    {
    {
-    (pDoc->p_DSN+i)->Usr = p_Dlg.s_User;
-    (pDoc->p_DSN+i)->Pas = p_Dlg.s_Password;
+    (pDoc->p_DSN+i)->Usr = p_Dlg->s_User;
+    (pDoc->p_DSN+i)->Pas = p_Dlg->s_Password;
     (pDoc->db_Br+i)->UserName  = (pDoc->p_DSN+i)->Usr;
     (pDoc->db_Br+i)->Password  = (pDoc->p_DSN+i)->Pas;
     (pDoc->db_Br+i)->UserName  = (pDoc->p_DSN+i)->Usr;
     (pDoc->db_Br+i)->Password  = (pDoc->p_DSN+i)->Pas;
+    OK = TRUE;
    }
    }
-   p_Dlg.Destroy();
+   delete p_Dlg;
+   if (!OK) return;
    //--------------------
    //--------------------
-   goto Weiter; // We have what we want, leave
+   break; // We have what we want, leave
   }
  }
   }
  }
- Weiter:
  //-------------------------------------------
  SaveDSN.Empty();
 }
  //-------------------------------------------
  SaveDSN.Empty();
 }
-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
wxWidgets (Impactor)