Added VC++ project files (seems logical)

[wxWidgets.git] / demos / dbbrowse / dbtree.cpp

diff --git a/demos/dbbrowse/dbtree.cpp b/demos/dbbrowse/dbtree.cpp
index d262e2fae2e639d737b7fe1e38ed48391af67b43..1ee46028e42f0e79ae4a28ec5cf4e339c0bdeeb8 100644 (file)
--- a/demos/dbbrowse/dbtree.cpp
+++ b/demos/dbbrowse/dbtree.cpp
@@ -1,45 +1,45 @@
-//---------------------------------------------------------------------------
-// Name:        DBTree.h
-// Purpose:     Programm Control with a Tree
+//----------------------------------------------------------------------------------------
+// Name:        DBTree.cpp/.h
+// Purpose:     Tree with Table and Views, branches show Field information

 // Author:      Mark Johnson
 // Modified by:
 // Created:     19991129
 // Author:      Mark Johnson
 // Modified by:
 // Created:     19991129

-// 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__
 #endif
 #ifndef __WXMSW__
 #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(DBTree, wxTreeCtrl)
  EVT_MOTION (DBTree::OnMouseMove)
  EVT_TREE_SEL_CHANGED(TREE_CTRL_DB, DBTree::OnSelChanged)
 BEGIN_EVENT_TABLE(DBTree, wxTreeCtrl)
  EVT_MOTION (DBTree::OnMouseMove)
  EVT_TREE_SEL_CHANGED(TREE_CTRL_DB, DBTree::OnSelChanged)


@@ -49,71 +49,80 @@ BEGIN_EVENT_TABLE(DBTree, wxTreeCtrl)
  EVT_MENU(DATA_TABLE,DBTree::OnTableClass)
  EVT_MENU(DATA_TABLE_ALL,DBTree::OnTableClassAll)
 END_EVENT_TABLE()
  EVT_MENU(DATA_TABLE,DBTree::OnTableClass)
  EVT_MENU(DATA_TABLE_ALL,DBTree::OnTableClassAll)
 END_EVENT_TABLE()

-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------

 // DBTree implementation
 // DBTree implementation

-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------

 IMPLEMENT_DYNAMIC_CLASS(DBTree, wxTreeCtrl)
 IMPLEMENT_DYNAMIC_CLASS(DBTree, wxTreeCtrl)

-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------

 DBTree::DBTree(wxWindow *parent)  : wxTreeCtrl(parent)
 {
 }
 DBTree::DBTree(wxWindow *parent)  : wxTreeCtrl(parent)
 {
 }

+//----------------------------------------------------------------------------------------

 DBTree::DBTree(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const wxSize& size, long style)
 DBTree::DBTree(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
  // should correspond to TreeIc_xxx enum

-#if defined(__WXMSW__)
- p_imageListNormal->Add(wxICON(Logo));
+#if !defined(__WXMSW__)
+ #include "bitmaps/logo.xpm"
+ #include "bitmaps/dsnclose.xpm"
+ #include "bitmaps/dsnopen.xpm"
+ #include "bitmaps/tab.xpm"
+ #include "bitmaps/view.xpm"
+ #include "bitmaps/col.xpm"
+ #include "bitmaps/key.xpm"
+ #include "bitmaps/keyf.xpm"
+ #include "bitmaps/d_open.xpm"
+ #include "bitmaps/d_closed.xpm"
+#endif
+ p_imageListNormal->Add(wxICON(aLogo));

  p_imageListNormal->Add(wxICON(DsnClosed));
  p_imageListNormal->Add(wxICON(DsnOpen));
  p_imageListNormal->Add(wxICON(TAB));
  p_imageListNormal->Add(wxICON(DsnClosed));
  p_imageListNormal->Add(wxICON(DsnOpen));
  p_imageListNormal->Add(wxICON(TAB));

+ p_imageListNormal->Add(wxICON(VIEW));

  p_imageListNormal->Add(wxICON(COL));
  p_imageListNormal->Add(wxICON(KEY));
  p_imageListNormal->Add(wxICON(KEYF));
  p_imageListNormal->Add(wxICON(DocOpen));
  p_imageListNormal->Add(wxICON(DocOpen));
  p_imageListNormal->Add(wxICON(COL));
  p_imageListNormal->Add(wxICON(KEY));
  p_imageListNormal->Add(wxICON(KEYF));
  p_imageListNormal->Add(wxICON(DocOpen));
  p_imageListNormal->Add(wxICON(DocOpen));

-#else
-  #include "bitmaps/logo.xpm"
-  #include "bitmaps/dsnclose.xpm"
-  #include "bitmaps/dsnopen.xpm"
-  #include "bitmaps/tab.xpm"
-  #include "bitmaps/key.xpm"
-  #include "bitmaps/keyf.xpm"
-  #include "bitmaps/d_open.xpm"
-  #include "bitmaps/d_closed.xpm"
-#endif
-

  SetImageList(p_imageListNormal);
  ct_BrowserDB = NULL;
  SetImageList(p_imageListNormal);
  ct_BrowserDB = NULL;

+ popupMenu1   = NULL;
+ popupMenu2   = NULL;

 }
 }

-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------

 DBTree::~DBTree()
 {
 DBTree::~DBTree()
 {

+//  delete (pDoc->db_Br+i_Which);

  // wxLogMessage("DBTree::~DBTree() - Vor  OnCloseDB()");
  (pDoc->db_Br+i_Which)->OnCloseDB(FALSE);
  // wxLogMessage("DBTree::~DBTree() - Nach OnCloseDB()");
  (pDoc->db_Br+i_Which)->db_BrowserDB = NULL;
  (pDoc->db_Br+i_Which)->ct_BrowserDB = NULL;
  (pDoc->db_Br+i_Which)->cl_BrowserDB = NULL;
  // wxLogMessage("DBTree::~DBTree() - Vor  OnCloseDB()");
  (pDoc->db_Br+i_Which)->OnCloseDB(FALSE);
  // wxLogMessage("DBTree::~DBTree() - Nach OnCloseDB()");
  (pDoc->db_Br+i_Which)->db_BrowserDB = NULL;
  (pDoc->db_Br+i_Which)->ct_BrowserDB = NULL;
  (pDoc->db_Br+i_Which)->cl_BrowserDB = NULL;

+

  delete ct_BrowserDB;
  delete p_imageListNormal;
  delete ct_BrowserDB;
  delete p_imageListNormal;

+ if (popupMenu1)       // If the DSN has no Tables, then no delete should be done !
+  delete popupMenu1;
+ if (popupMenu1)       // If the DSN has no Tables, then no delete should be done !
+  delete popupMenu2;

 }
 }

-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------

 #undef TREE_EVENT_HANDLER
 #undef TREE_EVENT_HANDLER

-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------

 int  DBTree::OnPopulate()
 {
  wxTreeItemId Root, Folder, Docu, Funkt;
 int  DBTree::OnPopulate()
 {
  wxTreeItemId Root, Folder, Docu, Funkt;

- int i,x,y;
+ int i,x,y,z=0, TableType;

  wxString SQL_TYPE, DB_TYPE;
  wxString SQL_TYPE, DB_TYPE;

- //----------------------------------------------------------------------------------------------------------------------------
- if((pDoc->db_Br+i_Which)->Initialize(FALSE))
+ SetFont(* pDoc->ft_Doc);
+ //---------------------------------------------------------------------------------------
+ if ((pDoc->db_Br+i_Which)->Initialize(FALSE))

  {
  {

+  wxStopWatch sw;
+  wxBeginBusyCursor();

   ct_BrowserDB = (pDoc->db_Br+i_Which)->OnGetCatalog(FALSE);
   if (ct_BrowserDB)
   { // Use the wxDatabase Information
   ct_BrowserDB = (pDoc->db_Br+i_Which)->OnGetCatalog(FALSE);
   if (ct_BrowserDB)
   { // Use the wxDatabase Information


@@ -121,42 +130,60 @@ int  DBTree::OnPopulate()
    Root = AddRoot(Temp0,TreeIc_DsnOpen,TreeIc_DsnOpen,new DBTreeData("Root"));
    for (x=0;x<ct_BrowserDB->numTables;x++)
    {
    Root = AddRoot(Temp0,TreeIc_DsnOpen,TreeIc_DsnOpen,new DBTreeData("Root"));
    for (x=0;x<ct_BrowserDB->numTables;x++)
    {

+    wxYield();
+    TableType = 0; // TABLE = 1 ; VIEW = 2 ; 0 We are not interested in

     if (!wxStrcmp((ct_BrowserDB->pTableInf+x)->tableType,"TABLE"))    // only TABLES
     if (!wxStrcmp((ct_BrowserDB->pTableInf+x)->tableType,"TABLE"))    // only TABLES

+     TableType = 1;
+    if (!wxStrcmp((ct_BrowserDB->pTableInf+x)->tableType,"VIEW"))     // and  VIEWS
+     TableType = 2;
+    if (TableType)    // only TABLES or Views

     {
     {

-     Temp0.Printf(_("Tablename(%s) with (%d)Columns ; Remarks(%s)"),  (ct_BrowserDB->pTableInf+x)->tableName,
-                        (ct_BrowserDB->pTableInf+x)->numCols,
-                        (ct_BrowserDB->pTableInf+x)->tableRemarks);

      Temp1.Printf("TN(%s",(ct_BrowserDB->pTableInf+x)->tableName);
      //----
      (ct_BrowserDB->pTableInf+x)->pColInf = (pDoc->db_Br+i_Which)->OnGetColumns((ct_BrowserDB->pTableInf+x)->tableName,(ct_BrowserDB->pTableInf+x)->numCols,FALSE);
      //----
      if ((ct_BrowserDB->pTableInf+x)->pColInf)
      {
      Temp1.Printf("TN(%s",(ct_BrowserDB->pTableInf+x)->tableName);
      //----
      (ct_BrowserDB->pTableInf+x)->pColInf = (pDoc->db_Br+i_Which)->OnGetColumns((ct_BrowserDB->pTableInf+x)->tableName,(ct_BrowserDB->pTableInf+x)->numCols,FALSE);
      //----
      if ((ct_BrowserDB->pTableInf+x)->pColInf)
      {

-      Temp0.Printf(_("Tablename(%s) with (%d)Columns ; Remarks(%s)"),  (ct_BrowserDB->pTableInf+x)->tableName,
-                        (ct_BrowserDB->pTableInf+x)->numCols,
-                        (ct_BrowserDB->pTableInf+x)->tableRemarks);
-      Folder = AppendItem(Root,Temp0,TreeIc_TAB,TreeIc_TAB, new DBTreeData(Temp1));
+      if (TableType == 1)  // Table
+      {
+       Temp0.Printf(_("Table-Name(%s) with (%d)Columns ; Remarks(%s)"),  (ct_BrowserDB->pTableInf+x)->tableName,
+                              (ct_BrowserDB->pTableInf+x)->numCols,(ct_BrowserDB->pTableInf+x)->tableRemarks);
+       Folder = AppendItem(Root,Temp0,TreeIc_TAB,TreeIc_TAB, new DBTreeData(Temp1));
+      }
+      if (TableType == 2)  // View
+      {
+       Temp0.Printf(_("View-Name(%s) with (%d)Columns ; Remarks(%s)"),  (ct_BrowserDB->pTableInf+x)->tableName,
+                              (ct_BrowserDB->pTableInf+x)->numCols,(ct_BrowserDB->pTableInf+x)->tableRemarks);
+       Folder = AppendItem(Root,Temp0,TreeIc_VIEW,TreeIc_VIEW, new DBTreeData(Temp1));
+      }

       for (y=0;y<(ct_BrowserDB->pTableInf+x)->numCols;y++)
       {
        Temp1.Printf("FN(%s",((ct_BrowserDB->pTableInf+x)->pColInf+y)->colName);
        // Here is where we find out if the Column is a Primary / Foreign Key
        if (((ct_BrowserDB->pTableInf+x)->pColInf+y)->PkCol != 0)  // Primary Key
        {
       for (y=0;y<(ct_BrowserDB->pTableInf+x)->numCols;y++)
       {
        Temp1.Printf("FN(%s",((ct_BrowserDB->pTableInf+x)->pColInf+y)->colName);
        // Here is where we find out if the Column is a Primary / Foreign Key
        if (((ct_BrowserDB->pTableInf+x)->pColInf+y)->PkCol != 0)  // Primary Key
        {

-        Docu = AppendItem(Folder,((ct_BrowserDB->pTableInf+x)->pColInf+y)->colName,TreeIc_KEY,TreeIc_KEY,new DBTreeData(Temp1));
-        Temp2.Printf(_("This Key is used in the following Tables : %s"),((ct_BrowserDB->pTableInf+x)->pColInf+y)->PkTableName);
+        Temp2.Printf("(%d) - %s",((ct_BrowserDB->pTableInf+x)->pColInf+y)->PkCol,((ct_BrowserDB->pTableInf+x)->pColInf+y)->colName);
+        Docu = AppendItem(Folder,Temp2,TreeIc_KEY,TreeIc_KEY,new DBTreeData(Temp1));
+        Temp2 = ((ct_BrowserDB->pTableInf+x)->pColInf+y)->PkTableName;
+        if (Temp2 == "")
+         Temp2 = _("None");
+        Temp2.Printf(_("This Primary Key is used in the following Tables : %s"),Temp2.c_str());

         Funkt = AppendItem(Docu,Temp2,TreeIc_DocClosed,TreeIc_DocOpen,new DBTreeData("KEY"));
        }
        else
         Funkt = AppendItem(Docu,Temp2,TreeIc_DocClosed,TreeIc_DocOpen,new DBTreeData("KEY"));
        }
        else

+       {

         if (((ct_BrowserDB->pTableInf+x)->pColInf+y)->FkCol != 0) // Foreign Key
         {
         if (((ct_BrowserDB->pTableInf+x)->pColInf+y)->FkCol != 0) // Foreign Key
         {

-         Docu = AppendItem(Folder,((ct_BrowserDB->pTableInf+x)->pColInf+y)->colName,TreeIc_KEYF,TreeIc_KEYF,new DBTreeData(Temp1));
+         Temp2.Printf("(%d) - %s",((ct_BrowserDB->pTableInf+x)->pColInf+y)->FkCol,((ct_BrowserDB->pTableInf+x)->pColInf+y)->colName);
+         Docu = AppendItem(Folder,Temp2,TreeIc_KEYF,TreeIc_KEYF,new DBTreeData(Temp1));

          Temp2.Printf(_("This Foreign Key comes from the following Table : %s"),((ct_BrowserDB->pTableInf+x)->pColInf+y)->FkTableName);
          Funkt = AppendItem(Docu,Temp2,TreeIc_DocClosed,TreeIc_DocOpen,new DBTreeData("KEYF"));
         }
         else
          Docu = AppendItem(Folder,((ct_BrowserDB->pTableInf+x)->pColInf+y)->colName,TreeIc_COL,TreeIc_COL,new DBTreeData(Temp1));
          Temp2.Printf(_("This Foreign Key comes from the following Table : %s"),((ct_BrowserDB->pTableInf+x)->pColInf+y)->FkTableName);
          Funkt = AppendItem(Docu,Temp2,TreeIc_DocClosed,TreeIc_DocOpen,new DBTreeData("KEYF"));
         }
         else
          Docu = AppendItem(Folder,((ct_BrowserDB->pTableInf+x)->pColInf+y)->colName,TreeIc_COL,TreeIc_COL,new DBTreeData(Temp1));

-       SQL_TYPE.Printf(_("SQL_C_???? (%d)"),((ct_BrowserDB->pTableInf+x)->pColInf+y)->sqlDataType);
-       DB_TYPE.Printf(_("DB_DATA_TYPE_???? (%d)"),((ct_BrowserDB->pTableInf+x)->pColInf+y)->dbDataType);
+       }
+       SQL_TYPE.Printf("SQL_C_???? (%d)",((ct_BrowserDB->pTableInf+x)->pColInf+y)->sqlDataType);
+       DB_TYPE.Printf("DB_DATA_TYPE_???? (%d)",((ct_BrowserDB->pTableInf+x)->pColInf+y)->dbDataType);

        for (i=1;i<=(pDoc->db_Br+i_Which)->i_SqlTyp[0];i++)
        {
         if (((ct_BrowserDB->pTableInf+x)->pColInf+y)->sqlDataType == (pDoc->db_Br+i_Which)->i_SqlTyp[i])
        for (i=1;i<=(pDoc->db_Br+i_Which)->i_SqlTyp[0];i++)
        {
         if (((ct_BrowserDB->pTableInf+x)->pColInf+y)->sqlDataType == (pDoc->db_Br+i_Which)->i_SqlTyp[i])


@@ -174,26 +201,38 @@ int  DBTree::OnPopulate()
        SQL_TYPE += DB_TYPE;
        Funkt = AppendItem(Docu,SQL_TYPE,TreeIc_DocClosed,TreeIc_DocOpen,new DBTreeData(SQL_TYPE));
        SQL_TYPE.Printf("%10s %d,%d",((ct_BrowserDB->pTableInf+x)->pColInf+y)->typeName,
        SQL_TYPE += DB_TYPE;
        Funkt = AppendItem(Docu,SQL_TYPE,TreeIc_DocClosed,TreeIc_DocOpen,new DBTreeData(SQL_TYPE));
        SQL_TYPE.Printf("%10s %d,%d",((ct_BrowserDB->pTableInf+x)->pColInf+y)->typeName,

-                    ((ct_BrowserDB->pTableInf+x)->pColInf+y)->columnSize,
-                    ((ct_BrowserDB->pTableInf+x)->pColInf+y)->decimalDigits);
+        ((ct_BrowserDB->pTableInf+x)->pColInf+y)->columnSize,((ct_BrowserDB->pTableInf+x)->pColInf+y)->decimalDigits);

        Funkt = AppendItem(Docu,SQL_TYPE,TreeIc_DocClosed,TreeIc_DocOpen,new DBTreeData(SQL_TYPE));
       }  // for (y=0;y<(ct_BrowserDB->pTableInf+x)->numCols;y++)
      }   // if ((ct_BrowserDB->pTableInf+x)->pColInf)
      else
       Folder = AppendItem(Root,Temp0,TreeIc_FolderClosed,TreeIc_FolderOpen, new DBTreeData(Temp1));
        Funkt = AppendItem(Docu,SQL_TYPE,TreeIc_DocClosed,TreeIc_DocOpen,new DBTreeData(SQL_TYPE));
       }  // for (y=0;y<(ct_BrowserDB->pTableInf+x)->numCols;y++)
      }   // if ((ct_BrowserDB->pTableInf+x)->pColInf)
      else
       Folder = AppendItem(Root,Temp0,TreeIc_FolderClosed,TreeIc_FolderOpen, new DBTreeData(Temp1));

-    }    // if ((ct_BrowserDB->pTableInf+x)->tableType == "TABLE")
+     z++;
+     if (z % 10 == 0)
+     {
+      Temp0.Printf(_("-I-> DBTree::OnPopulate(%s) - Table %6d (from %d) has been read."),(ct_BrowserDB->pTableInf+x)->tableName,z,ct_BrowserDB->numTables);
+      pDoc->p_MainFrame->SetStatusText(Temp0, 0);
+     }
+    }    // if ((ct_BrowserDB->pTableInf+x)->tableType == "TABLE" or VIEW)
+    // else
+    //  wxLogMessage(_("\n-I-> if ! TABLE or VIEW  >%s<"),(ct_BrowserDB->pTableInf+x)->tableType);

    }     // for (x=0;x<ct_BrowserDB->numTables;x++)
   }      // if (ct_BrowserDB)
   else
    wxLogMessage(_("\n-E-> DBTree::OnPopulate() : Invalid Catalog Pointer : Failed"));
    }     // for (x=0;x<ct_BrowserDB->numTables;x++)
   }      // if (ct_BrowserDB)
   else
    wxLogMessage(_("\n-E-> DBTree::OnPopulate() : Invalid Catalog Pointer : Failed"));

+  wxEndBusyCursor();
+  Temp0.Printf(_("-I-> DBTree::OnPopulate() - %6d Tables have been read. - Time needed : %ld ms"),z,sw.Time());
+  wxLogMessage(Temp0);
+  pDoc->p_MainFrame->SetStatusText(Temp0, 0);

  }       // if((pDoc->db_Br+i_Which)->Initialize(FALSE))
  else
  {
   wxLogMessage(_("\n-E-> DBTree::OnPopulate() : A valid Pointer could not be created : Failed"));
  }       // if((pDoc->db_Br+i_Which)->Initialize(FALSE))
  else
  {
   wxLogMessage(_("\n-E-> DBTree::OnPopulate() : A valid Pointer could not be created : Failed"));

+  return 0;

  }
  }

- //----------------------------------------------------------------------------------------------------------------------------
+ //---------------------------------------------------------------------------------------

  Expand(Root);
  Expand(Root);

- //----------------------------------------------------------------------------------------------------------------------------
+ //---------------------------------------------------------------------------------------

  popupMenu1 = NULL;
  popupMenu1 = new wxMenu("");
  popupMenu1->Append(DATA_DB, _("Make wxDB.cpp/h "));
  popupMenu1 = NULL;
  popupMenu1 = new wxMenu("");
  popupMenu1->Append(DATA_DB, _("Make wxDB.cpp/h "));


@@ -204,28 +243,28 @@ int  DBTree::OnPopulate()
  popupMenu2->Append(DATA_SHOW, _("Show Data"));
  popupMenu2->AppendSeparator();
  popupMenu2->Append(DATA_TABLE, _("Make wxTable.cpp/h "));
  popupMenu2->Append(DATA_SHOW, _("Show Data"));
  popupMenu2->AppendSeparator();
  popupMenu2->Append(DATA_TABLE, _("Make wxTable.cpp/h "));

- //----------------------------------------------------------------------------------------------------------------------------
+ //---------------------------------------------------------------------------------------

  return 0;
 }
  return 0;
 }

-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------

 void DBTree::OnSelChanged(wxTreeEvent& WXUNUSED(event))
 {
 void DBTree::OnSelChanged(wxTreeEvent& WXUNUSED(event))
 {

- int i;
- Temp0.Empty();
- pDoc->p_MainFrame->SetStatusText(Temp0,0);
- // Get the Information that we need
- wxTreeItemId itemId = GetSelection();
- DBTreeData *item = (DBTreeData *)GetItemData(itemId);
- if ( item != NULL )
- {
-  int Treffer = 0;
-  Temp1.Printf("%s",item->m_desc.c_str());
-  //-----------------------------------------------------------------------------------------
-  if (Temp1.Contains("ODBC-"))
+  int i;
+  Temp0.Empty();
+  pDoc->p_MainFrame->SetStatusText(Temp0,0);
+  // Get the Information that we need
+  wxTreeItemId itemId = GetSelection();
+  DBTreeData *item = (DBTreeData *)GetItemData(itemId);
+  if ( item != NULL )

   {
   {

-   Temp1 = Temp1.Mid(5,wxSTRING_MAXLEN);
-   for (i=0;i<pDoc->i_DSN;i++)
+   int Treffer = 0;
+   Temp1.Printf("%s",item->m_desc.c_str());
+   //-------------------------------------------------------------------------------------
+   if (Temp1.Contains("ODBC-"))

    {
    {

+    Temp1 = Temp1.Mid(5,wxSTRING_MAXLEN);
+    for (i=0;i<pDoc->i_DSN;i++)
+    {

     if (Temp1 == (pDoc->p_DSN+i)->Dsn)
     {
      // pDoc->OnChosenDSN(i);
     if (Temp1 == (pDoc->p_DSN+i)->Dsn)
     {
      // pDoc->OnChosenDSN(i);


@@ -233,27 +272,27 @@ void DBTree::OnSelChanged(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)),
-                bool2String(IsBold(itemId)),
-                GetChildrenCount(itemId),
-                GetChildrenCount(itemId));
-   LogBuf.Printf("-I-> DBTree::OnSelChanged - %s",Temp0.c_str());
-   wxLogMessage( "%s", LogBuf.c_str() );
-   */
-   //---------------------------------------------------
+    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() );
+     */
+   //-------------------------------------------------------------------------------------

   }
  }
 }
   }
  }
 }

-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------

 void DBTree::OnRightSelect(wxTreeEvent& WXUNUSED(event))
 {
  int i;
 void DBTree::OnRightSelect(wxTreeEvent& WXUNUSED(event))
 {
  int i;


@@ -265,7 +304,7 @@ void DBTree::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 (!wxStrcmp("Root",Temp1))
   {
    PopupMenu(popupMenu1,TreePos.x,TreePos.y);
   if (!wxStrcmp("Root",Temp1))
   {
    PopupMenu(popupMenu1,TreePos.x,TreePos.y);


@@ -280,28 +319,28 @@ void DBTree::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)),
-                bool2String(IsBold(itemId)),
-                GetChildrenCount(itemId),
-                GetChildrenCount(itemId));
-   LogBuf.Printf("-I-> DBTree::OnSelChanged - %s",Temp0.c_str());
-   wxLogMessage( "%s", LogBuf.c_str() );
-   */
-   //---------------------------------------------------
+     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() );
+     */
+   //-------------------------------------------------------------------------------------

   }
  }
 }
   }
  }
 }

-//---------------------------------------------------------------------------
-void DBTree::OnDBGrid(wxMenu& , wxCommandEvent& event)
+//----------------------------------------------------------------------------------------
+void DBTree::OnDBGrid(wxCommandEvent& event)

 {
  int i;
  // Get the Information that we need
 {
  int i;
  // Get the Information that we need


@@ -322,8 +361,8 @@ void DBTree::OnDBGrid(wxMenu& , wxCommandEvent& event)
   }
  }
 }
   }
  }
 }

-//---------------------------------------------------------------------------
-void DBTree::OnDBClass(wxMenu& , wxCommandEvent& event)
+//----------------------------------------------------------------------------------------
+void DBTree::OnDBClass(wxCommandEvent& event)

 {
  // int i;
  // Get the Information that we need
 {
  // int i;
  // Get the Information that we need


@@ -335,8 +374,8 @@ void DBTree::OnDBClass(wxMenu& , wxCommandEvent& event)
   wxMessageBox(Temp0);
  }
 }
   wxMessageBox(Temp0);
  }
 }

-//---------------------------------------------------------------------------
-void DBTree::OnTableClass(wxMenu& , wxCommandEvent& event)
+//----------------------------------------------------------------------------------------
+void DBTree::OnTableClass(wxCommandEvent& event)

 {
  int i;
  // Get the Information that we need
 {
  int i;
  // Get the Information that we need


@@ -356,8 +395,8 @@ void DBTree::OnTableClass(wxMenu& , wxCommandEvent& event)
   }
  }
 }
   }
  }
 }

-//---------------------------------------------------------------------------
-void DBTree::OnTableClassAll(wxMenu& , wxCommandEvent& event)
+//----------------------------------------------------------------------------------------
+void DBTree::OnTableClassAll(wxCommandEvent& event)

 {
  // int i;
  // Get the Information that we need
 {
  // int i;
  // Get the Information that we need


@@ -369,9 +408,9 @@ void DBTree::OnTableClassAll(wxMenu& , wxCommandEvent& event)
   wxMessageBox(Temp0);
  }
 }
   wxMessageBox(Temp0);
  }
 }

-//------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------

 void DBTree::OnMouseMove(wxMouseEvent &event)
 {
  TreePos = event.GetPosition();
 }
 void DBTree::OnMouseMove(wxMouseEvent &event)
 {
  TreePos = event.GetPosition();
 }

-//------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------