Added wxDbTable::SetOrderByColNums() function

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

diff --git a/demos/dbbrowse/doc.cpp b/demos/dbbrowse/doc.cpp
index 806ceaf397a79fbdcacaf85e5d171aa745956c70..59acac82564ccbb8ce7e9bd67b28661c8394b6ba 100644 (file)
--- a/demos/dbbrowse/doc.cpp
+++ b/demos/dbbrowse/doc.cpp
@@ -1,45 +1,45 @@
-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------

 // Name:        Doc.cpp
 // Name:        Doc.cpp

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

 // Author:      Mark Johnson, mj10777@gmx.net
 // Modified by: 19990808.mj10777
 // BJO        : Bart A.M. JOURQUIN
 // Created:     19990808
 // Copyright:   (c) Mark Johnson
 // Licence:     wxWindows license
 // Author:      Mark Johnson, mj10777@gmx.net
 // Modified by: 19990808.mj10777
 // BJO        : Bart A.M. JOURQUIN
 // Created:     19990808
 // Copyright:   (c) Mark Johnson
 // Licence:     wxWindows license

-//---------------------------------------------------------------------------
-//-- all #ifdefs that the whole Project needs. ------------------------------
-//---------------------------------------------------------------------------
+// RCS-ID:      $Id$
+//----------------------------------------------------------------------------------------
+//-- 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

-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------
-//-- 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 !

-//---------------------------------------------------------------------------
-//-- Some Global Vars for all Files (extern in ?.h needed) -----------------
+//----------------------------------------------------------------------------------------
+//-- Some Global Vars for all Files (extern in ?.h needed) -------------------------------

 // Global structure for holding ODBC connection information
 // Global structure for holding ODBC connection information

- struct DbStuff DbConnectInf;
-//---------------------------------------------------------------------------
+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;
 {
  db_Br          = NULL;
  p_DSN          = NULL;


@@ -54,14 +54,17 @@ mjDoc::mjDoc()
  p_PageArea     = NULL;
  i_TabNr        = 0;
  i_PageNr       = 0;
  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 ??
  // ----------------------------------------------------------
 {
  // ----------------------------------------------------------
  // -E-> The Tree Controls take to long to close : Why ??
  // ----------------------------------------------------------

- // wxMessageBox("-I-> end Doc");
+ delete ft_Doc;
+ ft_Doc  = NULL;

  p_TabArea->Show(FALSE);    // Deactivate the Window
  p_PageArea->Show(FALSE);    // Deactivate the Window
  p_PgmCtrl = NULL;
  p_TabArea->Show(FALSE);    // Deactivate the Window
  p_PageArea->Show(FALSE);    // Deactivate the Window
  p_PgmCtrl = NULL;


@@ -73,97 +76,99 @@ mjDoc::~mjDoc()
  p_Splitter = NULL;
  delete p_Splitter;
  delete [] db_Br;
  p_Splitter = NULL;
  delete p_Splitter;
  delete [] db_Br;

- //  wxMessageBox("~mjDoc");
+ //  wxMessageBox("~MainDoc");

 }
 }

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

 {
 {

- //-------------------------------------------------------------------
- if (!OnInitView())                 // LogBook is now activ
+ wxStopWatch sw;
+ //---------------------------------------------------------------------------------------
+ if (!OnInitView())

   return FALSE;
  p_PgmCtrl->OnPopulate();
   return FALSE;
  p_PgmCtrl->OnPopulate();

- //-------------------------------------------------------------------
+ //---------------------------------------------------------------------------------------
+ wxLogMessage(_("-I-> MainDoc::OnNewDocument() - End - Time needed : %ld ms"),sw.Time());

  return TRUE;
 }
  return TRUE;
 }

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

 {
  Sash = p_ProgramCfg->Read("/MainFrame/Sash", 200);
 {
  Sash = p_ProgramCfg->Read("/MainFrame/Sash", 200);

- // wxMessageBox("OnInitView() - Begin ","-I->mjDoc::OnInitView");
- //--------------------------------------------------------------------------
+ // wxMessageBox("OnInitView() - Begin ","-I->MainDoc::OnInitView");
+ //---------------------------------------------------------------------------------------

  // create "workplace" window
  // create "workplace" window

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

  p_TabArea = new wxTabbedWindow(); // Init the Pointer
  p_TabArea->Create(p_Splitter, -1);
  p_TabArea = new wxTabbedWindow(); // Init the Pointer
  p_TabArea->Create(p_Splitter, -1);

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

  p_PgmCtrl = new PgmCtrl(p_TabArea, TREE_CTRL_PGM,wxDefaultPosition, wxDefaultSize,
  p_PgmCtrl = new PgmCtrl(p_TabArea, TREE_CTRL_PGM,wxDefaultPosition, wxDefaultSize,

-                                    wxTR_HAS_BUTTONS | wxSUNKEN_BORDER);
+                         wxTR_HAS_BUTTONS | wxSUNKEN_BORDER);

  p_PgmCtrl->i_TabArt = 0; // 0 = Tab ; 1 = Page
  p_PgmCtrl->i_ViewNr = p_TabArea->GetTabCount()-1;
  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
  wxBitmap *p_FolderClose = new wxBitmap("PgmCtrl"); //, wxBITMAP_TYPE_BMP_RESOURCE); // BJO20000115

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

  p_TabArea->AddTab(p_PgmCtrl,"PgmCtrl",p_FolderClose);
  p_TabArea->AddTab(p_PgmCtrl,"PgmCtrl",p_FolderClose);

- //--------------------------------------------------------------------------
+ delete p_FolderClose;      // Memory leak
+ p_FolderClose = NULL;
+ //---------------------------------------------------------------------------------------

  // now create "output" window
  // now create "output" window

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

  p_PageArea = new wxPaggedWindow();  // Init the Pointer
  p_PageArea->Create(p_Splitter, -1);
  p_PageArea = new wxPaggedWindow();  // Init the Pointer
  p_PageArea->Create(p_Splitter, -1);

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

  p_LogWin = new wxTextCtrl(p_PageArea,-1,wxEmptyString,
  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");
- p_LogWin->SetFont(* ft_Temp);
+      wxDefaultPosition, wxDefaultSize,wxTE_MULTILINE );
+ p_LogWin->SetFont(* ft_Doc);

  // Don't forget ! This is always : i_TabArt = 0 ; i_ViewNr = 1;
  // 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_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_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_PgmCtrl->pDoc = this;
  p_TabArea->SetActiveTab(i_PageNr);

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

  p_Splitter->Initialize(p_TabArea);
  p_Splitter->SplitHorizontally(p_TabArea,p_PageArea,Sash);
  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);
+ //---------------------------------------------------------------------------------------
+ // 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;
 }
 //----------------------------------------------------------------------------------------
  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;
 {
  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;
  }
  // 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;
  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)))
+ //---------------------------------------------------------------------------------------
+ while(wxDbGetDataSource(DbConnectInf.Henv, Dsn, sizeof(Dsn), DsDesc, sizeof(DsDesc)))

  {
   i_DSN++;   // How many Dsn have we ?
   KeyString.Printf("%s%c%s",Dsn, sep, DsDesc);
  {
   i_DSN++;   // How many Dsn have we ?
   KeyString.Printf("%s%c%s",Dsn, sep, DsDesc);


@@ -175,7 +180,7 @@ bool mjDoc::OnInitODBC()
 
  char ** s_SortDSN = s_SortDSNList.ListToArray();        //BJO
  char ** s_SortDsDesc = s_SortDsDescList.ListToArray();  //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++)
  // Allocate n ODBC-DSN objects to hold the information
  p_DSN = new DSN[i_DSN];  //BJO
  for (i=0;i<i_DSN;i++)


@@ -187,11 +192,11 @@ bool mjDoc::OnInitODBC()
   (p_DSN+i)->Drv = s_SortDsDesc[i];
   (p_DSN+i)->Usr = "";
   (p_DSN+i)->Pas = "";
   (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,(p_DSN+i)->Drv);
+  Temp0.Printf("%02d) Dsn(%s) DsDesc(%s)",i,(p_DSN+i)->Dsn.c_str(),(p_DSN+i)->Drv.c_str());

   wxLogMessage(Temp0);
  }
  i = 0;
   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++)
  // Allocate n wxDatabase objects to hold the column information
  db_Br = new BrowserDB[i_DSN];
  for (i=0;i<i_DSN;i++)


@@ -203,31 +208,28 @@ bool mjDoc::OnInitODBC()
   (db_Br+i)->pDoc        = this;
   (db_Br+i)->i_Which     = i;
  }
   (db_Br+i)->pDoc        = this;
   (db_Br+i)->i_Which     = i;
  }

-
- if (SQLFreeEnv(&DbConnectInf.Henv) != SQL_SUCCESS) // BJO20000125
+ if (SQLFreeEnv(DbConnectInf.Henv) != SQL_SUCCESS) // BJO20000125 / MJ10777.20000309 : no &

  {
  {

-   // Error freeing environment handle
+  // Error freeing environment handle

  }
  }

-

  delete [] s_SortDSN;
  delete [] s_SortDsDesc;
  delete [] s_SortDSN;
  delete [] s_SortDsDesc;

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

  if (!i_DSN)
  {
   wxMessageBox(_("No Dataset names found in ODBC!\n" \
  if (!i_DSN)
  {
   wxMessageBox(_("No Dataset names found in ODBC!\n" \

-                "            Program will exit!\n\n" \
-                "                       Ciao"),"-E-> Fatal situation");
+      "           Program will exit!\n\n" \
+      "                       Ciao"),"-E-> Fatal situation");

   return FALSE;
  }
   return FALSE;
  }

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

  return TRUE;
 }
 //----------------------------------------------------------------------------------------
  return TRUE;
 }
 //----------------------------------------------------------------------------------------

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

 {
  // wxLogMessage("OnChosenDSN(%d) - Begin",Which);
 {
  // wxLogMessage("OnChosenDSN(%d) - Begin",Which);

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

  if (p_DBTree != NULL)
  {
   p_TabArea->Show(FALSE);    // Deactivate the Window
  if (p_DBTree != NULL)
  {
   p_TabArea->Show(FALSE);    // Deactivate the Window


@@ -238,7 +240,7 @@ bool mjDoc::OnChosenDSN(int Which)
  //-------------------------
  p_TabArea->Show(FALSE);    // Deactivate the Window
  p_DBTree = new DBTree(p_TabArea, TREE_CTRL_DB,wxDefaultPosition, wxDefaultSize,
  //-------------------------
  p_TabArea->Show(FALSE);    // Deactivate the Window
  p_DBTree = new DBTree(p_TabArea, TREE_CTRL_DB,wxDefaultPosition, wxDefaultSize,

-                                    wxTR_HAS_BUTTONS | wxSUNKEN_BORDER);
+   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_TabArea->AddTab(p_DBTree,(p_DSN+Which)->Dsn," ? ");
  p_DBTree->i_ViewNr = p_TabArea->GetTabCount()-1;
  p_TabArea->Show(TRUE);    // Deactivate the Window


@@ -248,12 +250,12 @@ bool mjDoc::OnChosenDSN(int Which)
  p_DBTree->pDoc     = this;
  p_DBTree->OnPopulate();
  p_TabArea->SetActiveTab(p_DBTree->i_ViewNr);
  p_DBTree->pDoc     = this;
  p_DBTree->OnPopulate();
  p_TabArea->SetActiveTab(p_DBTree->i_ViewNr);

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

  // wxLogMessage("OnChosenDSN(%d) - End",Which);
  return TRUE;
 }
 //----------------------------------------------------------------------------------------
  // 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());
  //-------------------------
 {
  // wxLogMessage("OnChosenTbl(%d,%s)",Tab,Table.c_str());
  //-------------------------


@@ -281,7 +283,7 @@ bool mjDoc::OnChosenTbl(int Tab,wxString Table)
  {
   p_TabArea->Show(FALSE);    // Deactivate the Window
   p_DBGrid = new DBGrid(p_TabArea,GRID_CTRL_DB,wxDefaultPosition, wxDefaultSize,
  {
   p_TabArea->Show(FALSE);    // Deactivate the Window
   p_DBGrid = new DBGrid(p_TabArea,GRID_CTRL_DB,wxDefaultPosition, wxDefaultSize,

-                                                               wxSUNKEN_BORDER);
+                                               wxSUNKEN_BORDER);

   p_TabArea->AddTab(p_DBGrid, Table, "");
   p_DBGrid->i_ViewNr = p_TabArea->GetTabCount()-1;
   p_DBGrid->pDoc       = this;
   p_TabArea->AddTab(p_DBGrid, Table, "");
   p_DBGrid->i_ViewNr = p_TabArea->GetTabCount()-1;
   p_DBGrid->pDoc       = this;


@@ -294,7 +296,7 @@ bool mjDoc::OnChosenTbl(int Tab,wxString Table)
  {
   p_PageArea->Show(FALSE);   // Deactivate the Window
   p_DBGrid = new DBGrid(p_PageArea,GRID_CTRL_DB,wxDefaultPosition, wxDefaultSize,
  {
   p_PageArea->Show(FALSE);   // Deactivate the Window
   p_DBGrid = new DBGrid(p_PageArea,GRID_CTRL_DB,wxDefaultPosition, wxDefaultSize,

-                                                                wxSUNKEN_BORDER);
+                                                wxSUNKEN_BORDER);

   p_PageArea->AddTab(p_DBGrid, Table, "");
   p_DBGrid->i_ViewNr = p_PageArea->GetTabCount()-1;
   p_DBGrid->pDoc       = this;
   p_PageArea->AddTab(p_DBGrid, Table, "");
   p_DBGrid->i_ViewNr = p_PageArea->GetTabCount()-1;
   p_DBGrid->pDoc       = this;


@@ -305,14 +307,14 @@ bool mjDoc::OnChosenTbl(int Tab,wxString Table)
   p_PageArea->SetActiveTab(p_DBGrid->i_ViewNr);
  }
  p_DBGrid->i_TabArt = Tab;
   p_PageArea->SetActiveTab(p_DBGrid->i_ViewNr);
  }
  p_DBGrid->i_TabArt = Tab;

- //---*----------------------
+ //--------------------------

  return TRUE;;
 }
 //----------------------------------------------------------------------------------------
  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());
+ // 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;
 }
  wxLogMessage(Temp0);  Temp0.Empty();
  return;
 }


@@ -320,8 +322,7 @@ void mjDoc::OnLeer(wxString Aufrufer)
 BEGIN_EVENT_TABLE(DocSplitterWindow, wxSplitterWindow)
 END_EVENT_TABLE()
 //----------------------------------------------------------------------------------------
 BEGIN_EVENT_TABLE(DocSplitterWindow, wxSplitterWindow)
 END_EVENT_TABLE()
 //----------------------------------------------------------------------------------------

-// Define a constructor for my p_Splitter

 DocSplitterWindow::DocSplitterWindow(wxWindow *parent, wxWindowID id) : wxSplitterWindow(parent, id)
 DocSplitterWindow::DocSplitterWindow(wxWindow *parent, wxWindowID id) : wxSplitterWindow(parent, id)

-{
+{ // Define a constructor for my p_Splitter

 }
 //----------------------------------------------------------------------------------------
 }
 //----------------------------------------------------------------------------------------