dbbrowse.cpp dbbrowse.h

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/demos/dbbrowse/dbbrowse.cpp b/demos/dbbrowse/dbbrowse.cpp
index 090073bd2dda4c9e2cb3e774850e2842e211565c..5770c159015dc72a045bea03f767017396a8867a 100644 (file)
--- a/demos/dbbrowse/dbbrowse.cpp
+++ b/demos/dbbrowse/dbbrowse.cpp
@@ -38,8 +38,6 @@
 //----------------------------------------------------------------------------------------
 //-- 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
@@ -152,7 +150,7 @@ bool MainApp::OnInit(void)  // Does everything needed for a program start
   else
   { // Read in Foreign language's text for GetAppName() and Help
    m_locale.AddCatalog(GetAppName().c_str());
-   m_locale.AddCatalog("Help");
+   m_locale.AddCatalog("help");
   }
  } // Support the following languages  (std = english)
  else
@@ -165,6 +163,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";
+ 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

diff --git a/demos/dbbrowse/dbbrowse.h b/demos/dbbrowse/dbbrowse.h
index 0949892916d6a70cea7c689c3e48edf769865a7b..12596fdf9002f9f7ca10668303b267025778f33e 100644 (file)
--- a/demos/dbbrowse/dbbrowse.h
+++ b/demos/dbbrowse/dbbrowse.h
@@ -8,15 +8,6 @@
 // Licence:     wxWindows license
 // RCS-ID:      $Id$
 //----------------------------------------------------------------------------------------
-// Define a new application type
-//----------------------------------------------------------------------------------------
-class MainApp: public wxApp
-{
- public:
-  bool OnInit(void); // Programmstart
-  wxLocale m_locale; // locale we'll be using and language support - MUST be here !
-};
-//----------------------------------------------------------------------------------------
 // Define a new frame type
 //----------------------------------------------------------------------------------------
 class MainFrame: public wxFrame
@@ -40,6 +31,16 @@ class MainFrame: public wxFrame
  DECLARE_EVENT_TABLE()
 };
 //----------------------------------------------------------------------------------------
+// Define a new application type
+//----------------------------------------------------------------------------------------
+class MainApp: public wxApp
+{
+ public:
+  MainFrame *frame;                           // The one and only MainFrame
+  bool OnInit(void); // Programmstart
+  wxLocale m_locale; // locale we'll be using and language support - MUST be here !
+};
+//----------------------------------------------------------------------------------------
 // ID for the menu quit command
 //----------------------------------------------------------------------------------------
 #define QUIT                         777