added container class source

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

diff --git a/demos/dbbrowse/doc.cpp b/demos/dbbrowse/doc.cpp
index 256a200505004dff873f13c24f8c80a2be60575b..295391285535283362304758837e61e55b83717d 100644 (file)
--- a/demos/dbbrowse/doc.cpp
+++ b/demos/dbbrowse/doc.cpp
@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------

-// Name:        Doc.cpp
+// Name:        doc.cpp

 // Purpose:     Holds information for DBBrowser - (a do-it-yourself document)
 // Purpose:     Holds information for DBBrowser - (a do-it-yourself document)

-// Author:      Mark Johnson, mj10777@gmx.net
+// Author:      Mark Johnson

 // Modified by: 19990808.mj10777
 // BJO        : Bart A.M. JOURQUIN
 // Created:     19990808
 // Modified by: 19990808.mj10777
 // BJO        : Bart A.M. JOURQUIN
 // Created:     19990808


@@ -33,292 +33,303 @@
 //----------------------------------------------------------------------------------------
 //-- Some Global Vars for all Files (extern in ?.h needed) -------------------------------
 // Global structure for holding ODBC connection information
 //----------------------------------------------------------------------------------------
 //-- Some Global Vars for all Files (extern in ?.h needed) -------------------------------
 // Global structure for holding ODBC connection information

-struct DbStuff DbConnectInf;
+extern wxDbConnectInf DbConnectInf;
+

 //----------------------------------------------------------------------------------------
 wxConfigBase   *p_ProgramCfg;       // All Config and Path information
 wxLogTextCtrl  *p_LogBook;          // All Log messages
 wxString        LogBuf;             // String for all Logs
 //----------------------------------------------------------------------------------------
 wxConfigBase   *p_ProgramCfg;       // All Config and Path information
 wxLogTextCtrl  *p_LogBook;          // All Log messages
 wxString        LogBuf;             // String for all Logs

+

 //----------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------

-mjDoc::mjDoc()
+MainDoc::MainDoc()

 {
 {

- db_Br          = NULL;
- p_DSN          = NULL;
- i_DSN          = 0;
- p_Splitter     = NULL;
- p_MainFrame    = NULL;
- p_PgmCtrl      = NULL;               // Is not active
- p_DBTree       = NULL;
- p_DBGrid       = NULL;
- p_LogWin       = NULL;
- p_TabArea      = NULL;
- p_PageArea     = NULL;
- i_TabNr        = 0;
- i_PageNr       = 0;
- s_BColour = "WHEAT";
- ft_Doc = new wxFont(wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT));
+    db_Br          = NULL;
+    p_DSN          = NULL;
+    i_DSN          = 0;
+    p_Splitter     = NULL;
+    p_MainFrame    = NULL;
+    p_PgmCtrl      = NULL;               // Is not active
+    p_DBTree       = NULL;
+    p_DBGrid       = NULL;
+    p_LogWin       = NULL;
+    p_TabArea      = NULL;
+    p_PageArea     = NULL;
+    i_TabNr        = 0;
+    i_PageNr       = 0;
+    s_BColour      = "WHEAT";
+    ft_Doc         = new wxFont(wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT));

 }
 }

+

 //----------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------

-mjDoc::~mjDoc()
+MainDoc::~MainDoc()

 {
 {

- // ----------------------------------------------------------
- // -E-> The Tree Controls take to long to close : Why ??
- // ----------------------------------------------------------
- // wxMessageBox("-I-> end Doc");
- p_TabArea->Show(FALSE);    // Deactivate the Window
- p_PageArea->Show(FALSE);    // Deactivate the Window
- p_PgmCtrl = NULL;
- delete p_PgmCtrl;
- delete [] p_DSN;
- delete p_DBTree;
- p_TabArea  = NULL; delete p_TabArea;
- p_PageArea = NULL; delete p_PageArea;
- p_Splitter = NULL;
- delete p_Splitter;
- delete [] db_Br;
- //  wxMessageBox("~mjDoc");
+    p_TabArea->Show(FALSE);    // Deactivate the Window
+    p_PageArea->Show(FALSE);    // Deactivate the Window
+
+    // ----------------------------------------------------------
+    // -E-> The Tree Controls take to long to close : Why ??
+    // ----------------------------------------------------------
+    delete ft_Doc;     ft_Doc  = NULL;
+    delete p_PgmCtrl;  p_PgmCtrl = NULL;
+    delete [] p_DSN;
+    delete p_DBTree;
+    delete p_TabArea;  p_TabArea  = NULL;
+    delete p_PageArea; p_PageArea = NULL;
+    delete p_Splitter; p_Splitter = NULL;
+    delete [] db_Br;   db_Br      = NULL;
+    //  wxMessageBox("~MainDoc");

 }
 }

+

 //----------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------

-bool mjDoc::OnNewDocument()
+bool MainDoc::OnNewDocument()

 {
 {

- //---------------------------------------------------------------------------------------
- if (!OnInitView())
- {
-  return FALSE;
- }
- p_PgmCtrl->OnPopulate();
- //---------------------------------------------------------------------------------------
- return TRUE;
+    wxStopWatch sw;
+    //---------------------------------------------------------------------------------------
+    if (!OnInitView())
+        return FALSE;
+    p_PgmCtrl->OnPopulate();
+    //---------------------------------------------------------------------------------------
+    wxLogMessage(_("-I-> MainDoc::OnNewDocument() - End - Time needed : %ld ms"),sw.Time());
+    return TRUE;

 }
 }

+

 //----------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------

-bool mjDoc::OnInitView()
+bool MainDoc::OnInitView()

 {
 {

- Sash = p_ProgramCfg->Read("/MainFrame/Sash", 200);
- // wxMessageBox("OnInitView() - Begin ","-I->mjDoc::OnInitView");
- //---------------------------------------------------------------------------------------
- // create "workplace" window
- //---------------------------------------------------------------------------------------
- p_TabArea = new wxTabbedWindow(); // Init the Pointer
- p_TabArea->Create(p_Splitter, -1);
- //---------------------------------------------------------------------------------------
- p_PgmCtrl = new PgmCtrl(p_TabArea, TREE_CTRL_PGM,wxDefaultPosition, wxDefaultSize,
-                         wxTR_HAS_BUTTONS | wxSUNKEN_BORDER);
- p_PgmCtrl->i_TabArt = 0; // 0 = Tab ; 1 = Page
- p_PgmCtrl->i_ViewNr = p_TabArea->GetTabCount()-1;
- //---------------------------------------------------------------------------------------
- wxBitmap *p_FolderClose = new wxBitmap("PgmCtrl"); //, wxBITMAP_TYPE_BMP_RESOURCE); // BJO20000115
- //---------------------------------------------------------------------------------------
- p_TabArea->AddTab(p_PgmCtrl,"PgmCtrl",p_FolderClose);
- //---------------------------------------------------------------------------------------
- // now create "output" window
- //---------------------------------------------------------------------------------------
- p_PageArea = new wxPaggedWindow();  // Init the Pointer
- p_PageArea->Create(p_Splitter, -1);
- //---------------------------------------------------------------------------------------
- p_LogWin = new wxTextCtrl(p_PageArea,-1,wxEmptyString,
-      wxDefaultPosition, wxDefaultSize,wxTE_MULTILINE );
- //wxFont* ft_Temp = new wxFont(10,wxSWISS,wxNORMAL,wxBOLD,FALSE,"Comic Sans MS");
- wxFont* ft_Temp = new wxFont(wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT));
- p_LogWin->SetFont(* ft_Temp);
- // Don't forget ! This is always : i_TabArt = 0 ; i_ViewNr = 1;
- //---------------------------------------------------------------------------------------
- p_LogBook = new wxLogTextCtrl(p_LogWin); // make p_LogWin the LogBook
- p_LogBook->SetActiveTarget(p_LogBook);
- p_LogBook->SetTimestamp( NULL );
- //---------------------------------------------------------------------------------------
- p_PageArea->AddTab(p_LogWin,_("LogBook"), "what is this?" );
- i_TabNr  = p_TabArea->GetTabCount()-1;  // Add one when a new AddTab is done;
- i_PageNr = p_PageArea->GetTabCount()-1; // Add one when a new AddTab is done;
- //---------------------------------------------------------------------------------------
- p_PgmCtrl->pDoc = this;
- p_TabArea->SetActiveTab(i_PageNr);
- //---------------------------------------------------------------------------------------
- p_Splitter->Initialize(p_TabArea);
- p_Splitter->SplitHorizontally(p_TabArea,p_PageArea,Sash);
- //---------------------------------------------------------------------------------------
- if (!OnInitODBC())
-   return FALSE;
- //---------------------------------------------------------------------------------------
- Temp0.Printf("-I-> mjDoc::OnInitView() - End - %d DSN's found",i_DSN);
- p_MainFrame->SetStatusText(Temp0, 0);
- wxLogMessage(Temp0);
- return TRUE;
+    Sash = p_ProgramCfg->Read("/MainFrame/Sash", 200);
+    // wxMessageBox("OnInitView() - Begin ","-I->MainDoc::OnInitView");
+    //---------------------------------------------------------------------------------------
+    // create "workplace" window
+    //---------------------------------------------------------------------------------------
+    p_TabArea = new wxTabbedWindow(); // Init the Pointer
+    p_TabArea->Create(p_Splitter, -1);
+    //---------------------------------------------------------------------------------------
+    p_PgmCtrl = new PgmCtrl(p_TabArea, TREE_CTRL_PGM,wxDefaultPosition, wxDefaultSize,
+        wxTR_HAS_BUTTONS | wxSUNKEN_BORDER);
+    p_PgmCtrl->i_TabArt = 0; // 0 = Tab ; 1 = Page
+    p_PgmCtrl->i_ViewNr = p_TabArea->GetTabCount()-1;
+    //---------------------------------------------------------------------------------------
+    wxBitmap *p_FolderClose = new wxBitmap("PgmCtrl"); //, wxBITMAP_TYPE_BMP_RESOURCE); // BJO20000115
+    //---------------------------------------------------------------------------------------
+    p_TabArea->AddTab(p_PgmCtrl,"PgmCtrl",p_FolderClose);
+    delete p_FolderClose;      // Memory leak
+    p_FolderClose = NULL;
+    //---------------------------------------------------------------------------------------
+    // now create "output" window
+    //---------------------------------------------------------------------------------------
+    p_PageArea = new wxPagedWindow();  // Init the Pointer
+    p_PageArea->Create(p_Splitter, -1);
+    //---------------------------------------------------------------------------------------
+    p_LogWin = new wxTextCtrl(p_PageArea,-1,wxEmptyString,
+        wxDefaultPosition, wxDefaultSize,wxTE_MULTILINE );
+    p_LogWin->SetFont(* ft_Doc);
+    // Don't forget ! This is always : i_TabArt = 0 ; i_ViewNr = 1;
+    //---------------------------------------------------------------------------------------
+    p_LogBook = new wxLogTextCtrl(p_LogWin); // make p_LogWin the LogBook
+    p_LogBook->SetActiveTarget(p_LogBook);
+    p_LogBook->SetTimestamp( NULL );
+    //---------------------------------------------------------------------------------------
+    p_PageArea->AddTab(p_LogWin,_("LogBook"), "what is this?" );
+    i_TabNr  = p_TabArea->GetTabCount()-1;  // Add one when a new AddTab is done;
+    i_PageNr = p_PageArea->GetTabCount()-1; // Add one when a new AddTab is done;
+    //---------------------------------------------------------------------------------------
+    p_PgmCtrl->pDoc = this;
+    p_TabArea->SetActiveTab(i_PageNr);
+    //---------------------------------------------------------------------------------------
+    p_Splitter->Initialize(p_TabArea);
+    p_Splitter->SplitHorizontally(p_TabArea,p_PageArea,Sash);
+    //---------------------------------------------------------------------------------------
+    // if (!OnInitODBC())
+    //  return FALSE;
+    OnInitODBC();
+    //---------------------------------------------------------------------------------------
+    Temp0.Printf(_("-I-> MainDoc::OnInitView() - End - %d DSN's found"),i_DSN);
+    p_MainFrame->SetStatusText(Temp0, 0);
+    wxLogMessage(Temp0);
+    return TRUE;

 }
 }

+

 //----------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------

-bool mjDoc::OnInitODBC()
+bool MainDoc::OnInitODBC()

 {
 {

- char Dsn[SQL_MAX_DSN_LENGTH + 1];
- char DsDesc[255]; // BJO20002501 instead of 512
- Temp0 = "";
- i_DSN = 0;       // Counter
- int i = 0;
- //---------------------------------------------------------------------------------------
- // Initialize the ODBC Environment for Database Operations
+    char Dsn[SQL_MAX_DSN_LENGTH + 1];
+    char DsDesc[255]; // BJO20002501 instead of 512
+    Temp0 = "";
+    i_DSN = 0;       // Counter
+    int i = 0;
+    //---------------------------------------------------------------------------------------
+    // Initialize the ODBC Environment for Database Operations

 
 

- if (SQLAllocEnv(&DbConnectInf.Henv) != SQL_SUCCESS)
- {
-  return FALSE;
- }
- //---------------------------------------------------------------------------------------
- const char sep = 3; // separator character used in string between DSN ans DsDesc
- wxStringList s_SortDSNList, s_SortDsDescList;
- // BJO-20000127
- // In order to have same sort result on both Dsn and DsDesc, create a 'keyed' string.
- // The key will be removed after sorting
- wxString KeyString;
- //---------------------------------------------------------------------------------------
- while(GetDataSource(DbConnectInf.Henv, Dsn, sizeof(Dsn), DsDesc, sizeof(DsDesc)))
- {
-  i_DSN++;   // How many Dsn have we ?
-  KeyString.Printf("%s%c%s",Dsn, sep, DsDesc);
-  s_SortDSNList.Add(Dsn);
-  s_SortDsDescList.Add(KeyString);
- }
- s_SortDSNList.Sort();     //BJO
- s_SortDsDescList.Sort();  //BJO
+    if (!DbConnectInf.AllocHenv())
+    {
+        return FALSE;
+    }

 
 

- char ** s_SortDSN = s_SortDSNList.ListToArray();        //BJO
- char ** s_SortDsDesc = s_SortDsDescList.ListToArray();  //BJO
- //---------------------------------------------------------------------------------------
- // Allocate n ODBC-DSN objects to hold the information
- p_DSN = new DSN[i_DSN];  //BJO
- for (i=0;i<i_DSN;i++)
- {
-  KeyString = s_SortDsDesc[i];
-  KeyString = KeyString.AfterFirst(sep);
-  strcpy(s_SortDsDesc[i],KeyString.c_str());
-  (p_DSN+i)->Dsn = s_SortDSN[i];
-  (p_DSN+i)->Drv = s_SortDsDesc[i];
-  (p_DSN+i)->Usr = "";
-  (p_DSN+i)->Pas = "";
-  Temp0.Printf("%02d) Dsn(%s) DsDesc(%s)",i,(p_DSN+i)->Dsn.c_str(),(p_DSN+i)->Drv.c_str());
-  wxLogMessage(Temp0);
- }
- i = 0;
- //---------------------------------------------------------------------------------------
- // Allocate n wxDatabase objects to hold the column information
- db_Br = new BrowserDB[i_DSN];
- for (i=0;i<i_DSN;i++)
- {
-  (db_Br+i)->p_LogWindow = p_LogWin;
-  (db_Br+i)->ODBCSource  = (p_DSN+i)->Dsn;
-  (db_Br+i)->UserName    = (p_DSN+i)->Usr;
-  (db_Br+i)->Password    = (p_DSN+i)->Pas;
-  (db_Br+i)->pDoc        = this;
-  (db_Br+i)->i_Which     = i;
- }
- if (SQLFreeEnv(&DbConnectInf.Henv) != SQL_SUCCESS) // BJO20000125
- {
-  // Error freeing environment handle
- }
- delete [] s_SortDSN;
- delete [] s_SortDsDesc;
- //---------------------------------------------------------------------------------------
- if (!i_DSN)
- {
-  wxMessageBox(_("No Dataset names found in ODBC!\n" \
-      "           Program will exit!\n\n" \
-      "                       Ciao"),"-E-> Fatal situation");
-  return FALSE;
- }
- //---------------------------------------------------------------------------------------
- return TRUE;
+    //---------------------------------------------------------------------------------------
+    const char sep = 3; // separator character used in string between DSN ans DsDesc
+    wxStringList s_SortDSNList, s_SortDsDescList;
+    // BJO-20000127
+    // In order to have same sort result on both Dsn and DsDesc, create a 'keyed' string.
+    // The key will be removed after sorting
+    wxString KeyString;
+    //---------------------------------------------------------------------------------------
+    while(wxDbGetDataSource(DbConnectInf.GetHenv(), Dsn, sizeof(Dsn), DsDesc, sizeof(DsDesc)))
+    {
+        i_DSN++;   // How many Dsn have we ?
+        KeyString.Printf("%s%c%s",Dsn, sep, DsDesc);
+        s_SortDSNList.Add(Dsn);
+        s_SortDsDescList.Add(KeyString);
+    }
+    s_SortDSNList.Sort();     //BJO
+    s_SortDsDescList.Sort();  //BJO
+    
+    char ** s_SortDSN = s_SortDSNList.ListToArray();        //BJO
+    char ** s_SortDsDesc = s_SortDsDescList.ListToArray();  //BJO
+    //---------------------------------------------------------------------------------------
+    // Allocate n ODBC-DSN objects to hold the information
+    p_DSN = new DSN[i_DSN];  //BJO
+    for (i=0;i<i_DSN;i++)
+    {
+        KeyString = s_SortDsDesc[i];
+        KeyString = KeyString.AfterFirst(sep);
+        strcpy(s_SortDsDesc[i],KeyString.c_str());
+        (p_DSN+i)->Dsn = s_SortDSN[i];
+        (p_DSN+i)->Drv = s_SortDsDesc[i];
+        (p_DSN+i)->Usr = "";
+        (p_DSN+i)->Pas = "";
+        Temp0.Printf("%02d) Dsn(%s) DsDesc(%s)",i,(p_DSN+i)->Dsn.c_str(),(p_DSN+i)->Drv.c_str());
+        wxLogMessage(Temp0);
+    }
+    i = 0;
+    //---------------------------------------------------------------------------------------
+    // Allocate n wxDatabase objects to hold the column information
+    db_Br = new BrowserDB[i_DSN];
+    for (i=0;i<i_DSN;i++)
+    {
+        (db_Br+i)->p_LogWindow = p_LogWin;
+        (db_Br+i)->ODBCSource  = (p_DSN+i)->Dsn;
+        (db_Br+i)->UserName    = (p_DSN+i)->Usr;
+        (db_Br+i)->Password    = (p_DSN+i)->Pas;
+        (db_Br+i)->pDoc        = this;
+        (db_Br+i)->i_Which     = i;
+    }
+
+    DbConnectInf.FreeHenv();
+
+    delete [] s_SortDSN;
+    delete [] s_SortDsDesc;
+    //---------------------------------------------------------------------------------------
+    if (!i_DSN)
+    {
+        wxMessageBox(_("No Dataset names found in ODBC!\n" \
+            "           Program will exit!\n\n" \
+            "                       Ciao"),"-E-> Fatal situation");
+        return FALSE;
+    }
+    //---------------------------------------------------------------------------------------
+    return TRUE;

 }
 }

+

 //----------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------

-bool mjDoc::OnChosenDSN(int Which)
+bool MainDoc::OnChosenDSN(int Which)

 {
 {

- // wxLogMessage("OnChosenDSN(%d) - Begin",Which);
- //---------------------------------------------------------------------------------------
- if (p_DBTree != NULL)
- {
-  p_TabArea->Show(FALSE);    // Deactivate the Window
-  p_TabArea->RemoveTab(p_DBTree->i_ViewNr);
-  p_TabArea->Show(TRUE);     // Activate the Window
-  OnChosenTbl(77,"");
- }
- //-------------------------
- p_TabArea->Show(FALSE);    // Deactivate the Window
- p_DBTree = new DBTree(p_TabArea, TREE_CTRL_DB,wxDefaultPosition, wxDefaultSize,
-   wxTR_HAS_BUTTONS | wxSUNKEN_BORDER);
- p_TabArea->AddTab(p_DBTree,(p_DSN+Which)->Dsn," ? ");
- p_DBTree->i_ViewNr = p_TabArea->GetTabCount()-1;
- p_TabArea->Show(TRUE);    // Deactivate the Window
- p_DBTree->i_Which  = Which;
- p_DBTree->s_DSN    = (p_DSN+Which)->Dsn;
- p_DBTree->i_TabArt = 0;
- p_DBTree->pDoc     = this;
- p_DBTree->OnPopulate();
- p_TabArea->SetActiveTab(p_DBTree->i_ViewNr);
- //---------------------------------------------------------------------------------------
- // wxLogMessage("OnChosenDSN(%d) - End",Which);
- return TRUE;
+    // wxLogMessage("OnChosenDSN(%d) - Begin",Which);
+    //---------------------------------------------------------------------------------------
+    if (p_DBTree != NULL)
+    {
+        p_TabArea->Show(FALSE);    // Deactivate the Window
+        p_TabArea->RemoveTab(p_DBTree->i_ViewNr);
+        p_TabArea->Show(TRUE);     // Activate the Window
+        OnChosenTbl(77,"");
+    }
+    //-------------------------
+    p_TabArea->Show(FALSE);    // Deactivate the Window
+    p_DBTree = new DBTree(p_TabArea, TREE_CTRL_DB,wxDefaultPosition, wxDefaultSize,
+        wxTR_HAS_BUTTONS | wxSUNKEN_BORDER);
+    p_TabArea->AddTab(p_DBTree,(p_DSN+Which)->Dsn," ? ");
+    p_DBTree->i_ViewNr = p_TabArea->GetTabCount()-1;
+    p_TabArea->Show(TRUE);    // Deactivate the Window
+    p_DBTree->i_Which  = Which;
+    p_DBTree->s_DSN    = (p_DSN+Which)->Dsn;
+    p_DBTree->i_TabArt = 0;
+    p_DBTree->pDoc     = this;
+    p_DBTree->OnPopulate();
+    p_TabArea->SetActiveTab(p_DBTree->i_ViewNr);
+    //---------------------------------------------------------------------------------------
+    // wxLogMessage("OnChosenDSN(%d) - End",Which);
+    return TRUE;

 }
 }

+

 //----------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------

-bool mjDoc::OnChosenTbl(int Tab,wxString Table)
+bool MainDoc::OnChosenTbl(int Tab,wxString Table)

 {
 {

- // wxLogMessage("OnChosenTbl(%d,%s)",Tab,Table.c_str());
- //-------------------------
- if (p_DBGrid != NULL)
- {
-  if (p_DBGrid->i_TabArt == 0)
-  {
-   p_TabArea->Show(FALSE);    // Deactivate the Window
-   p_TabArea->RemoveTab(p_DBGrid->i_ViewNr);
-   p_TabArea->Show(TRUE);     // Activate the Window
-  }
-  if (p_DBGrid->i_TabArt == 1)
-  {
-   p_PageArea->Show(FALSE);   // Deactivate the Window
-   p_PageArea->RemoveTab(p_DBGrid->i_ViewNr);
-   p_PageArea->Show(TRUE);    // Activate the Window
-  }
-  p_DBGrid = NULL;
-  delete p_DBGrid;
- }
- if (Tab == 77)               // Delete only
-  return TRUE;
- //-------------------------
- if (Tab == 0)  // Tabview
- {
-  p_TabArea->Show(FALSE);    // Deactivate the Window
-  p_DBGrid = new DBGrid(p_TabArea,GRID_CTRL_DB,wxDefaultPosition, wxDefaultSize,
-                                               wxSUNKEN_BORDER);
-  p_TabArea->AddTab(p_DBGrid, Table, "");
-  p_DBGrid->i_ViewNr = p_TabArea->GetTabCount()-1;
-  p_DBGrid->pDoc       = this;
-  p_DBGrid->db_Br      = db_Br;
-  p_DBGrid->OnTableView(Table);
-  p_TabArea->SetActiveTab(p_DBGrid->i_ViewNr);
-  p_TabArea->Show(TRUE);     // Activate the Window
- }
- if (Tab == 1)  // Pageview
- {
-  p_PageArea->Show(FALSE);   // Deactivate the Window
-  p_DBGrid = new DBGrid(p_PageArea,GRID_CTRL_DB,wxDefaultPosition, wxDefaultSize,
-                                                wxSUNKEN_BORDER);
-  p_PageArea->AddTab(p_DBGrid, Table, "");
-  p_DBGrid->i_ViewNr = p_PageArea->GetTabCount()-1;
-  p_DBGrid->pDoc       = this;
-  p_DBGrid->db_Br      = db_Br;
-  p_DBGrid->i_Which    = p_DBTree->i_Which;
-  p_PageArea->Show(TRUE);    // Activate the Window
-  p_DBGrid->OnTableView(Table);
-  p_PageArea->SetActiveTab(p_DBGrid->i_ViewNr);
- }
- p_DBGrid->i_TabArt = Tab;
- //--------------------------
- return TRUE;;
+    // wxLogMessage("OnChosenTbl(%d,%s)",Tab,Table.c_str());
+    //-------------------------
+    if (p_DBGrid != NULL)
+    {
+        if (p_DBGrid->i_TabArt == 0)
+        {
+            p_TabArea->Show(FALSE);    // Deactivate the Window
+            p_TabArea->RemoveTab(p_DBGrid->i_ViewNr);
+            p_TabArea->Show(TRUE);     // Activate the Window
+        }
+        if (p_DBGrid->i_TabArt == 1)
+        {
+            p_PageArea->Show(FALSE);   // Deactivate the Window
+            p_PageArea->RemoveTab(p_DBGrid->i_ViewNr);
+            p_PageArea->Show(TRUE);    // Activate the Window
+        }
+        p_DBGrid = NULL;
+        delete p_DBGrid;
+    }
+    if (Tab == 77)               // Delete only
+        return TRUE;
+    //-------------------------
+    if (Tab == 0)  // Tabview
+    {
+        p_TabArea->Show(FALSE);    // Deactivate the Window
+        p_DBGrid = new DBGrid(p_TabArea,GRID_CTRL_DB,wxDefaultPosition, wxDefaultSize,
+            wxSUNKEN_BORDER);
+        p_TabArea->AddTab(p_DBGrid, Table, "");
+        p_DBGrid->i_ViewNr = p_TabArea->GetTabCount()-1;
+        p_DBGrid->pDoc       = this;
+        p_DBGrid->db_Br      = db_Br;
+        p_DBGrid->OnTableView(Table);
+        p_TabArea->SetActiveTab(p_DBGrid->i_ViewNr);
+        p_TabArea->Show(TRUE);     // Activate the Window
+    }
+    if (Tab == 1)  // Pageview
+    {
+        p_PageArea->Show(FALSE);   // Deactivate the Window
+        p_DBGrid = new DBGrid(p_PageArea,GRID_CTRL_DB,wxDefaultPosition, wxDefaultSize,
+            wxSUNKEN_BORDER);
+        p_PageArea->AddTab(p_DBGrid, Table, "");
+        p_DBGrid->i_ViewNr = p_PageArea->GetTabCount()-1;
+        p_DBGrid->pDoc       = this;
+        p_DBGrid->db_Br      = db_Br;
+        p_DBGrid->i_Which    = p_DBTree->i_Which;
+        p_PageArea->Show(TRUE);    // Activate the Window
+        p_DBGrid->OnTableView(Table);
+        p_PageArea->SetActiveTab(p_DBGrid->i_ViewNr);
+    }
+    p_DBGrid->i_TabArt = Tab;
+    //--------------------------
+    return TRUE;;

 }
 }

+

 //----------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------

-void mjDoc::OnLeer(wxString Aufrufer)
+void MainDoc::OnLeer(wxString Aufrufer)

 {
 {

- // Temp0.Printf(_("\nmjDoc::OnLeer(%s) : auch diese funktion steht eines Tages zur Verfügung !"),Aufrufer.c_str());
- Temp0.Printf(_("\nmjDoc::OnLeer(%s) : even this function will one day be available !"),Aufrufer.c_str());
- wxLogMessage(Temp0);  Temp0.Empty();
- return;
+    // Temp0.Printf(_("\nMainDoc::OnLeer(%s) : auch diese funktion steht eines Tages zur Verfügung !"),Aufrufer.c_str());
+    Temp0.Printf(_("\nMainDoc::OnLeer(%s) : even this function will one day be available !"),Aufrufer.c_str());
+    wxLogMessage(Temp0);  Temp0.Empty();
+    return;

 }
 }

+

 //----------------------------------------------------------------------------------------
 BEGIN_EVENT_TABLE(DocSplitterWindow, wxSplitterWindow)
 END_EVENT_TABLE()
 //----------------------------------------------------------------------------------------
 BEGIN_EVENT_TABLE(DocSplitterWindow, wxSplitterWindow)
 END_EVENT_TABLE()

+

 //----------------------------------------------------------------------------------------
 DocSplitterWindow::DocSplitterWindow(wxWindow *parent, wxWindowID id) : wxSplitterWindow(parent, id)
 { // Define a constructor for my p_Splitter
 //----------------------------------------------------------------------------------------
 DocSplitterWindow::DocSplitterWindow(wxWindow *parent, wxWindowID id) : wxSplitterWindow(parent, id)
 { // Define a constructor for my p_Splitter