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 a6694e0921734c9549d50bef2497156bc52f6d81..1ee46028e42f0e79ae4a28ec5cf4e339c0bdeeb8 100644 (file)
--- a/demos/dbbrowse/dbtree.cpp
+++ b/demos/dbbrowse/dbtree.cpp
@@ -88,18 +88,26 @@ DBTree::DBTree(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const w
  p_imageListNormal->Add(wxICON(DocOpen));
  SetImageList(p_imageListNormal);
  ct_BrowserDB = NULL;
+ popupMenu1   = NULL;
+ popupMenu2   = NULL;
 }
 //----------------------------------------------------------------------------------------
 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;
+
  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
@@ -159,7 +167,7 @@ int  DBTree::OnPopulate()
         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);
+        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
@@ -174,8 +182,8 @@ int  DBTree::OnPopulate()
         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])
@@ -202,7 +210,7 @@ int  DBTree::OnPopulate()
      z++;
      if (z % 10 == 0)
      {
-      Temp0.Printf(_("-I-> DBTree::OnPopulate(%s) - Table %6d has been read."),(ct_BrowserDB->pTableInf+x)->tableName,z);
+      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)
@@ -332,7 +340,7 @@ void DBTree::OnRightSelect(wxTreeEvent& WXUNUSED(event))
  }
 }
 //----------------------------------------------------------------------------------------
-void DBTree::OnDBGrid(wxMenu& , wxCommandEvent& event)
+void DBTree::OnDBGrid(wxCommandEvent& event)
 {
  int i;
  // Get the Information that we need
@@ -354,7 +362,7 @@ 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
@@ -367,7 +375,7 @@ void DBTree::OnDBClass(wxMenu& , wxCommandEvent& event)
  }
 }
 //----------------------------------------------------------------------------------------
-void DBTree::OnTableClass(wxMenu& , wxCommandEvent& event)
+void DBTree::OnTableClass(wxCommandEvent& event)
 {
  int i;
  // Get the Information that we need
@@ -388,7 +396,7 @@ 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