fix for assertion failure

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

diff --git a/demos/dbbrowse/dbbrowse.cpp b/demos/dbbrowse/dbbrowse.cpp
index a1ac115f0d303fbc998621b8c5a017104136fb85..c75312caabae537d8a131c65464fce3ec394cf3f 100644 (file)
--- a/demos/dbbrowse/dbbrowse.cpp
+++ b/demos/dbbrowse/dbbrowse.cpp
@@ -38,8 +38,6 @@
 //----------------------------------------------------------------------------------------
 //-- Some Global Vars for this file ------------------------------------------------------
 //----------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------
 //-- Some Global Vars for this file ------------------------------------------------------
 //----------------------------------------------------------------------------------------

-MainFrame *frame = NULL;                            // The one and only MainFrame
-//----------------------------------------------------------------------------------------

 BEGIN_EVENT_TABLE(MainFrame, wxFrame)
  EVT_MENU(QUIT, MainFrame::OnQuit)                  // Program End
  EVT_MENU(ABOUT, MainFrame::OnAbout)                // Program Discription
 BEGIN_EVENT_TABLE(MainFrame, wxFrame)
  EVT_MENU(QUIT, MainFrame::OnQuit)                  // Program End
  EVT_MENU(ABOUT, MainFrame::OnAbout)                // Program Discription


@@ -151,8 +149,10 @@ bool MainApp::OnInit(void)  // Does everything needed for a program start
   }
   else
   { // Read in Foreign language's text for GetAppName() and Help
   }
   else
   { // Read in Foreign language's text for GetAppName() and Help

-   m_locale.AddCatalog(GetAppName().c_str());
-   m_locale.AddCatalog("Help");
+   Temp0 = GetAppName();
+   Temp0 = Temp0.Lower();
+   m_locale.AddCatalog(Temp0.c_str());
+   m_locale.AddCatalog("help");

   }
  } // Support the following languages  (std = english)
  else
   }
  } // Support the following languages  (std = english)
  else


@@ -165,6 +165,7 @@ bool MainApp::OnInit(void)  // Does everything needed for a program start
  p_ProgramCfg->Write("/Local/language",s_Language);
  p_ProgramCfg->Write("/Local/langid",s_LangId);
  s_LangHelp.Printf("help.%s/%s.hhp",s_LangId.c_str(),GetAppName().c_str()); // "help.std/Garantie.hhp";
  p_ProgramCfg->Write("/Local/language",s_Language);
  p_ProgramCfg->Write("/Local/langid",s_LangId);
  s_LangHelp.Printf("help.%s/%s.hhp",s_LangId.c_str(),GetAppName().c_str()); // "help.std/Garantie.hhp";

+ s_LangHelp = s_LangHelp.Lower();                       // A must for Linux

  //---------------------------------------------------------------------------------------
  Temp0 = "NONE";                               // I don't remember why I did this
  p_ProgramCfg->Write("/NONE",Temp0);           // I don't remember why I did this
  //---------------------------------------------------------------------------------------
  Temp0 = "NONE";                               // I don't remember why I did this
  p_ProgramCfg->Write("/NONE",Temp0);           // I don't remember why I did this


@@ -262,11 +263,17 @@ bool MainApp::OnInit(void)  // Does everything needed for a program start
 MainFrame::MainFrame(wxFrame *frame, char *title,  const wxPoint& pos, const wxSize& size):
   wxFrame(frame, -1, title,  pos, size)
 {
 MainFrame::MainFrame(wxFrame *frame, char *title,  const wxPoint& pos, const wxSize& size):
   wxFrame(frame, -1, title,  pos, size)
 {

- //--- Everything is done in MainApp -----------------------------------------------------
+ p_Splitter = NULL; pDoc = NULL; p_Help = NULL;    // Keep the Pointers clean !
+ //--- Everything else is done in MainApp::OnInit() --------------------------------------

 }
 //----------------------------------------------------------------------------------------
 MainFrame::~MainFrame(void)
 {
 }
 //----------------------------------------------------------------------------------------
 MainFrame::~MainFrame(void)
 {

+ // Close the help frame; this will cause the config data to get written.
+ if (p_Help->GetFrame()) // returns NULL if no help frame active
+  p_Help->GetFrame()->Close(TRUE);
+ delete p_Help;  // Memory Leak
+ p_Help = NULL;

  // save the control's values to the config
  if (p_ProgramCfg == NULL)
    return;
  // save the control's values to the config
  if (p_ProgramCfg == NULL)
    return;


@@ -284,23 +291,21 @@ MainFrame::~MainFrame(void)
  // we want here!)
  // delete wxConfigBase::Set((wxConfigBase *) NULL);
  p_ProgramCfg->Flush(TRUE);        // saves   Objekt
  // we want here!)
  // delete wxConfigBase::Set((wxConfigBase *) NULL);
  p_ProgramCfg->Flush(TRUE);        // saves   Objekt

- if (!frame->pDoc)                 // If we have a Valid Document
-  delete frame->pDoc;              // Cleanup (MainDoc::~MainDoc)
+ if (pDoc)                         // If we have a Valid Document
+  delete pDoc;                     // Cleanup (MainDoc::~MainDoc)

 } // MainFrame::~MainFrame(void)
 //----------------------------------------------------------------------------------------
 void MainFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 } // MainFrame::~MainFrame(void)
 //----------------------------------------------------------------------------------------
 void MainFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

- // Close the help frame; this will cause the config data to get written.
- if (p_Help->GetFrame()) // returns NULL if no help frame active
-  p_Help->GetFrame()->Close(TRUE);

  Close(TRUE);
 }
 //----------------------------------------------------------------------------------------
 void MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
  Close(TRUE);
 }
 //----------------------------------------------------------------------------------------
 void MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {

- wxMessageDialog dialog(this, _("DBBrowser\nMark Johnson\nBerlin, Germany\nmj10777@gmx.net\n (c) 1999"),
-      _("About DBBrowser"), wxOK|wxCANCEL);
-
+ wxString Temp0, Temp1;
+ Temp0.Printf(_("%s\nMark Johnson\nBerlin, Germany\nmj10777@gmx.net\n (c) 2000"),p_ProgramCfg->GetAppName().c_str());
+ Temp1.Printf(_("About %s"),p_ProgramCfg->GetAppName().c_str());
+ wxMessageDialog dialog(this, Temp0,Temp1,wxOK|wxCANCEL);

  dialog.ShowModal();
 }
 //----------------------------------------------------------------------------------------
  dialog.ShowModal();
 }
 //----------------------------------------------------------------------------------------