Simplify wxFileNameFromPath() implementation to avoid redundancy.

[wxWidgets.git] / samples / config / conftest.cpp

diff --git a/samples/config/conftest.cpp b/samples/config/conftest.cpp
index 37b8c1f5439efa31e0d3b6999af5c9d27852352d..c30baf42714b187d0ac1c163df17e7414123fbcc 100644 (file)
--- a/samples/config/conftest.cpp
+++ b/samples/config/conftest.cpp
@@ -6,7 +6,7 @@
 // Created:     03.08.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     03.08.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -18,6 +18,10 @@
 // ----------------------------------------------------------------------------
 #include "wx/wxprec.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/wxprec.h"
 

+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+

 #ifndef  WX_PRECOMP
   #include "wx/wx.h"
 #endif //precompiled headers
 #ifndef  WX_PRECOMP
   #include "wx/wx.h"
 #endif //precompiled headers


@@ -25,9 +29,14 @@
 #include "wx/log.h"
 #include "wx/config.h"
 
 #include "wx/log.h"
 #include "wx/config.h"
 

+#ifndef __WXMSW__
+    #include "../sample.xpm"
+#endif
+

 // ----------------------------------------------------------------------------
 // classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // classes
 // ----------------------------------------------------------------------------

+

 class MyApp: public wxApp
 {
 public:
 class MyApp: public wxApp
 {
 public:


@@ -39,37 +48,29 @@ public:
 class MyFrame: public wxFrame
 {
 public:
 class MyFrame: public wxFrame
 {
 public:

-  MyFrame();
-  virtual ~MyFrame();
+    MyFrame();
+    virtual ~MyFrame();

 
 

-  // callbacks
-  void OnQuit(wxCommandEvent& event);
-  void OnAbout(wxCommandEvent& event);
-  void OnDelete(wxCommandEvent& event);
-  void OnCloseWindow(wxCloseEvent& event);
+    // callbacks
+    void OnQuit(wxCommandEvent& event);
+    void OnAbout(wxCommandEvent& event);
+    void OnDelete(wxCommandEvent& event);

 
 private:
 
 private:

-  wxTextCtrl *m_text;
-  wxCheckBox *m_check;
+    wxTextCtrl *m_text;
+    wxCheckBox *m_check;

 
 

-  DECLARE_EVENT_TABLE()
-};
-
-enum
-{
-  Minimal_Quit,
-  Minimal_About,
-  Minimal_Delete
+    DECLARE_EVENT_TABLE()

 };
 
 // ----------------------------------------------------------------------------
 // event tables
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------
 // event tables
 // ----------------------------------------------------------------------------

+

 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)

-  EVT_MENU(Minimal_Quit, MyFrame::OnQuit)
-  EVT_MENU(Minimal_About, MyFrame::OnAbout)
-  EVT_MENU(Minimal_Delete, MyFrame::OnDelete)
-  EVT_CLOSE(MyFrame::OnCloseWindow)
+  EVT_MENU(wxID_EXIT, MyFrame::OnQuit)
+  EVT_MENU(wxID_ABOUT, MyFrame::OnAbout)
+  EVT_MENU(wxID_DELETE, MyFrame::OnDelete)

 END_EVENT_TABLE()
 
 // ============================================================================
 END_EVENT_TABLE()
 
 // ============================================================================


@@ -79,58 +80,67 @@ END_EVENT_TABLE()
 // ----------------------------------------------------------------------------
 // application
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // application
 // ----------------------------------------------------------------------------

+

 IMPLEMENT_APP(MyApp)
 
 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit()
 {
 IMPLEMENT_APP(MyApp)
 
 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit()
 {

-  // we're using wxConfig's "create-on-demand" feature: it will create the
-  // config object when it's used for the first time. It has a number of
-  // advantages compared with explicitly creating our wxConfig:
-  //  1) we don't pay for it if we don't use it
-  //  2) there is no danger to create it twice
-
-  // application and vendor name are used by wxConfig to construct the name
-  // of the config file/registry key and must be set before the first call
-  // to Get() if you want to override the default values (the application
-  // name is the name of the executable and the vendor name is the same)
-  SetVendorName("wxWindows");
-  SetAppName("conftest"); // not needed, it's the default value
-
-  wxConfigBase *pConfig = wxConfigBase::Get();
-
-  // or you could also write something like this:
-  //  wxFileConfig *pConfig = new wxFileConfig("conftest");
-  //  wxConfigBase::Set(pConfig);
-  // where you can also specify the file names explicitly if you wish.
-  // Of course, calling Set() is optional and you only must do it if
-  // you want to later retrieve this pointer with Get().
-
-  // create the main program window
-  MyFrame *frame = new MyFrame;
-  frame->Show(TRUE);
-  SetTopWindow(frame);
-
-  // use our config object...
-  if ( pConfig->Read("/Controls/Check", 1l) != 0 ) {
-    wxMessageBox("You can disable this message box by unchecking\n"
-                 "the checkbox in the main window (of course, a real\n"
-                 "program would have a checkbox right here but we\n"
-                 "keep it simple)", "Welcome to wxConfig demo",
-                 wxICON_INFORMATION | wxOK);
-  }
+    if ( !wxApp::OnInit() )
+        return false;
+
+    // we're using wxConfig's "create-on-demand" feature: it will create the
+    // config object when it's used for the first time. It has a number of
+    // advantages compared with explicitly creating our wxConfig:
+    //  1) we don't pay for it if we don't use it
+    //  2) there is no danger to create it twice
+
+    // application and vendor name are used by wxConfig to construct the name
+    // of the config file/registry key and must be set before the first call
+    // to Get() if you want to override the default values (the application
+    // name is the name of the executable and the vendor name is the same)
+    SetVendorName(wxT("wxWidgets"));
+    SetAppName(wxT("conftest")); // not needed, it's the default value
+
+    wxConfigBase *pConfig = wxConfigBase::Get();
+
+    // uncomment this to force writing back of the defaults for all values
+    // if they're not present in the config - this can give the user an idea
+    // of all possible settings for this program
+    pConfig->SetRecordDefaults();
+
+    // or you could also write something like this:
+    //  wxFileConfig *pConfig = new wxFileConfig("conftest");
+    //  wxConfigBase::Set(pConfig);
+    // where you can also specify the file names explicitly if you wish.
+    // Of course, calling Set() is optional and you only must do it if
+    // you want to later retrieve this pointer with Get().
+
+    // create the main program window
+    MyFrame *frame = new MyFrame;
+    frame->Show(true);
+    SetTopWindow(frame);
+
+    // use our config object...
+    if ( pConfig->Read(wxT("/Controls/Check"), 1l) != 0 ) {
+        wxMessageBox(wxT("You can disable this message box by unchecking\n")
+                    wxT("the checkbox in the main window (of course, a real\n")
+                    wxT("program would have a checkbox right here but we\n")
+                    wxT("keep it simple)"), wxT("Welcome to wxConfig demo"),
+                    wxICON_INFORMATION | wxOK);
+    }

 
 

-  return TRUE;
+    return true;

 }
 
 int MyApp::OnExit()
 {
 }
 
 int MyApp::OnExit()
 {

-  // clean up: Set() returns the active config object as Get() does, but unlike
-  // Get() it doesn't try to create one if there is none (definitely not what
-  // we want here!)
-  delete wxConfigBase::Set((wxConfigBase *) NULL);
+    // clean up: Set() returns the active config object as Get() does, but unlike
+    // Get() it doesn't try to create one if there is none (definitely not what
+    // we want here!)
+    delete wxConfigBase::Set((wxConfigBase *) NULL);

 
 

-  return 0;
+    return 0;

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


@@ -139,108 +149,124 @@ int MyApp::OnExit()
 
 // main frame ctor
 MyFrame::MyFrame()
 
 // main frame ctor
 MyFrame::MyFrame()

-       : wxFrame((wxFrame *) NULL, -1, "wxConfig Demo")
-{
-  // submenu
-  wxMenu *sub_menu = new wxMenu( wxMENU_TEAROFF );
-  sub_menu->Append(Minimal_About, "&About", "About this sample");
-  sub_menu->Append(Minimal_About, "&About", "About this sample");
-  sub_menu->Append(Minimal_About, "&About", "About this sample");
-
-  // menu
-  wxMenu *file_menu = new wxMenu;
-
-  file_menu->Append(Minimal_Delete, "&Delete", "Delete config file");
-  file_menu->AppendSeparator();
-  file_menu->Append(Minimal_About, "&About", "About this sample");
-  file_menu->AppendSeparator();
-  file_menu->Append(Minimal_Quit, "E&xit", "Exit the program");
-  wxMenuBar *menu_bar = new wxMenuBar;
-  menu_bar->Append(file_menu, "&File");
-  SetMenuBar(menu_bar);
-
-  CreateStatusBar();
-
-  // child controls
-  wxPanel *panel = new wxPanel(this);
-  (void)new wxStaticText(panel, -1, "These controls remember their values!",
-                         wxPoint(10, 10), wxSize(300, 20));
-  m_text = new wxTextCtrl(panel, -1, "", wxPoint(10, 40), wxSize(300, 20));
-  m_check = new wxCheckBox(panel, -1, "show welcome message box at startup",
-                           wxPoint(10, 70), wxSize(300, 20));
-
-  // restore the control's values from the config
-
-  // NB: in this program, the config object is already created at this moment
-  // because we had called Get() from MyApp::OnInit(). However, if you later
-  // change the code and don't create it before this line, it won't break
-  // anything - unlike if you manually create wxConfig object with Create()
-  // or in any other way (then you must be sure to create it before using it!).
-  wxConfigBase *pConfig = wxConfigBase::Get();
-
-  // we could write Read("/Controls/Text") as well, it's just to show SetPath()
-  pConfig->SetPath("/Controls");
-
-  m_text->SetValue(pConfig->Read("Text", ""));
-  m_check->SetValue(pConfig->Read("Check", 1l) != 0);
-
-  // SetPath() understands ".."
-  pConfig->SetPath("../MainFrame");
-
-  // restore frame position and size
-  int x = pConfig->Read("x", 50),
-      y = pConfig->Read("y", 50),
-      w = pConfig->Read("w", 350),
-      h = pConfig->Read("h", 200);
-  Move(x, y);
-  SetClientSize(w, h);
-}
-
-void MyFrame::OnCloseWindow(wxCloseEvent& event)
+       : wxFrame((wxFrame *) NULL, wxID_ANY, wxT("wxConfig Demo"))

 {
 {

-    this->Destroy();
+    SetIcon(wxICON(sample));
+
+    // menu
+    wxMenu *file_menu = new wxMenu;
+
+    file_menu->Append(wxID_DELETE, wxT("&Delete"), wxT("Delete config file"));
+    file_menu->AppendSeparator();
+    file_menu->Append(wxID_ABOUT, wxT("&About\tF1"), wxT("About this sample"));
+    file_menu->AppendSeparator();
+    file_menu->Append(wxID_EXIT, wxT("E&xit\tAlt-X"), wxT("Exit the program"));
+    wxMenuBar *menu_bar = new wxMenuBar;
+    menu_bar->Append(file_menu, wxT("&File"));
+    SetMenuBar(menu_bar);
+
+#if wxUSE_STATUSBAR
+    CreateStatusBar();
+#endif // wxUSE_STATUSBAR
+
+    // child controls
+    wxPanel *panel = new wxPanel(this);
+    (void)new wxStaticText(panel, wxID_ANY, wxT("These controls remember their values!"),
+                            wxPoint(10, 10), wxSize(300, 20));
+    m_text = new wxTextCtrl(panel, wxID_ANY, wxT(""), wxPoint(10, 40), wxSize(300, 20));
+    m_check = new wxCheckBox(panel, wxID_ANY, wxT("show welcome message box at startup"),
+                            wxPoint(10, 70), wxSize(300, 20));
+
+    // restore the control's values from the config
+
+    // NB: in this program, the config object is already created at this moment
+    // because we had called Get() from MyApp::OnInit(). However, if you later
+    // change the code and don't create it before this line, it won't break
+    // anything - unlike if you manually create wxConfig object with Create()
+    // or in any other way (then you must be sure to create it before using it!).
+    wxConfigBase *pConfig = wxConfigBase::Get();
+
+    // we could write Read("/Controls/Text") as well, it's just to show SetPath()
+    pConfig->SetPath(wxT("/Controls"));
+
+    m_text->SetValue(pConfig->Read(wxT("Text"), wxT("")));
+    m_check->SetValue(pConfig->Read(wxT("Check"), 1l) != 0);
+
+    // SetPath() understands ".."
+    pConfig->SetPath(wxT("../MainFrame"));
+
+    // restore frame position and size
+    int x = pConfig->Read(wxT("x"), 50),
+        y = pConfig->Read(wxT("y"), 50),
+        w = pConfig->Read(wxT("w"), 350),
+        h = pConfig->Read(wxT("h"), 200);
+    Move(x, y);
+    SetClientSize(w, h);
+
+    pConfig->SetPath(wxT("/"));
+    wxString s;
+    if ( pConfig->Read(wxT("TestValue"), &s) )
+    {
+        wxLogStatus(this, wxT("TestValue from config is '%s'"), s.c_str());
+    }
+    else
+    {
+        wxLogStatus(this, wxT("TestValue not found in the config"));
+    }

 }
 
 void MyFrame::OnQuit(wxCommandEvent&)
 {
 }
 
 void MyFrame::OnQuit(wxCommandEvent&)
 {

-  Close(TRUE);
+    Close(true);

 }
 
 void MyFrame::OnAbout(wxCommandEvent&)
 {
 }
 
 void MyFrame::OnAbout(wxCommandEvent&)
 {

-  wxMessageBox(_T("wxConfig demo\n© Vadim Zeitlin 1998"), _T("About"),
-               wxICON_INFORMATION | wxOK);
+    wxMessageBox(wxT("wxConfig demo\n(c) 1998-2001 Vadim Zeitlin"), wxT("About"),
+                 wxICON_INFORMATION | wxOK);

 }
 
 void MyFrame::OnDelete(wxCommandEvent&)
 {
 }
 
 void MyFrame::OnDelete(wxCommandEvent&)
 {

-    if ( wxConfigBase::Get()->DeleteAll() ) {
-        wxLogMessage(_T("Config file/registry key successfully deleted."));
+    wxConfigBase *pConfig = wxConfigBase::Get();
+    if ( pConfig == NULL )
+    {
+        wxLogError(wxT("No config to delete!"));
+        return;
+    }

 
 

-        delete wxConfigBase::Set((wxConfigBase *) NULL);
+    if ( pConfig->DeleteAll() )
+    {
+        wxLogMessage(wxT("Config file/registry key successfully deleted."));
+
+        delete wxConfigBase::Set(NULL);

         wxConfigBase::DontCreateOnDemand();
     }
     else
     {
         wxConfigBase::DontCreateOnDemand();
     }
     else
     {

-        wxLogError(_T("Deleting config file/registry key failed."));
+        wxLogError(wxT("Deleting config file/registry key failed."));

     }
 }
 
 MyFrame::~MyFrame()
 {
     }
 }
 
 MyFrame::~MyFrame()
 {

-  // save the control's values to the config
-  wxConfigBase *pConfig = wxConfigBase::Get();
-  if ( pConfig == NULL )
-    return;
-  pConfig->Write("/Controls/Text", m_text->GetValue());
-  pConfig->Write("/Controls/Check", m_check->GetValue());
-
-  // save the frame position
-  int x, y, w, h;
-  GetClientSize(&w, &h);
-  GetPosition(&x, &y);
-  pConfig->Write("/MainFrame/x", (long) x);
-  pConfig->Write("/MainFrame/y", (long) y);
-  pConfig->Write("/MainFrame/w", (long) w);
-  pConfig->Write("/MainFrame/h", (long) h);
+    wxConfigBase *pConfig = wxConfigBase::Get();
+    if ( pConfig == NULL )
+        return;
+
+    // save the control's values to the config
+    pConfig->Write(wxT("/Controls/Text"), m_text->GetValue());
+    pConfig->Write(wxT("/Controls/Check"), m_check->GetValue());
+
+    // save the frame position
+    int x, y, w, h;
+    GetClientSize(&w, &h);
+    GetPosition(&x, &y);
+    pConfig->Write(wxT("/MainFrame/x"), (long) x);
+    pConfig->Write(wxT("/MainFrame/y"), (long) y);
+    pConfig->Write(wxT("/MainFrame/w"), (long) w);
+    pConfig->Write(wxT("/MainFrame/h"), (long) h);
+
+    pConfig->Write(wxT("/TestValue"), wxT("A test value"));

 }
 }

+