Rebake after adding libs html and xml to samples using lib adv

[wxWidgets.git] / utils / configtool / src / appsettings.cpp

diff --git a/utils/configtool/src/appsettings.cpp b/utils/configtool/src/appsettings.cpp
index 4eecaf4ca4bea045f73f7df946c46a08a1829379..c683cedb7536218a8f2dca632703fbc987fef447 100644 (file)
--- a/utils/configtool/src/appsettings.cpp
+++ b/utils/configtool/src/appsettings.cpp
@@ -6,35 +6,33 @@
 // Created:     2002-09-04
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     2002-09-04
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    
+// Licence:

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "appsettings.h"
-#endif
-
-#include "wx/wx.h"
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
 
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/wx.h"
-#endif

 
 

-#include "wx/wfstream.h"

 #include "wx/datstrm.h"
 #include "wx/datstrm.h"

-#include "wx/config.h"
-#include "wx/fileconf.h"

 #include "wx/dir.h"
 #include "wx/dir.h"

-#include "wx/valgen.h"

 #include "wx/colordlg.h"
 #include "wx/wxhtml.h"
 #include "wx/effects.h"
 #include "wx/spinctrl.h"
 #include "wx/tooltip.h"
 #include "wx/colordlg.h"
 #include "wx/wxhtml.h"
 #include "wx/effects.h"
 #include "wx/spinctrl.h"
 #include "wx/tooltip.h"

+#include "wx/settings.h"
+
+#endif

 
 

+#include "wx/wfstream.h"
+#include "wx/config.h"
+#include "wx/fileconf.h"
+#include "wx/valgen.h"

 #include "utils.h"
 #include "wxconfigtool.h"
 #include "appsettings.h"
 #include "utils.h"
 #include "wxconfigtool.h"
 #include "appsettings.h"


@@ -51,44 +49,40 @@ IMPLEMENT_DYNAMIC_CLASS(ctSettings, wxObject)
 ctSettings::ctSettings()
 {
     m_noUses = 0;
 ctSettings::ctSettings()
 {
     m_noUses = 0;

-    m_showToolBar = TRUE;
-    m_showWelcomeDialog = TRUE;
+    m_showToolBar = true;
+    m_showWelcomeDialog = true;

     m_exportDir = wxEmptyString;
 
     m_frameSize = wxRect(10, 10, 600, 500);
     // m_backgroundColour = wxColour(140, 172, 179); // blue-grey
     m_exportDir = wxEmptyString;
 
     m_frameSize = wxRect(10, 10, 600, 500);
     // m_backgroundColour = wxColour(140, 172, 179); // blue-grey

-    m_editWindowFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+    m_editWindowFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);

 
     m_appName = wxT("wxWidgets Configuration Tool");
     m_appNameShort = wxT("Configuration Tool");
 
     m_appName = wxT("wxWidgets Configuration Tool");
     m_appNameShort = wxT("Configuration Tool");

-    m_showSplashScreen = FALSE;
+    m_showSplashScreen = false;

     m_userName = wxEmptyString;
     m_frameStatus = ctSHOW_STATUS_NORMAL;
     m_userName = wxEmptyString;
     m_frameStatus = ctSHOW_STATUS_NORMAL;

-    m_loadLastDocument = TRUE;
-    m_firstTimeRun = TRUE;
-    m_smallToolbar = TRUE;
+    m_loadLastDocument = true;
+    m_firstTimeRun = true;
+    m_smallToolbar = true;

     m_mainSashSize = 200;
     m_mainSashSize = 200;

-    m_useToolTips = TRUE;
-    m_showTrayIcon = TRUE;
-    m_trayIconIsShown = FALSE;
-    m_useEnvironmentVariable = TRUE;
+    m_useToolTips = true;
+    m_showTrayIcon = true;
+    m_trayIconIsShown = false;
+    m_useEnvironmentVariable = true;

     m_frameworkDir = wxEmptyString;
     m_frameworkDir = wxEmptyString;

-    m_matchWholeWord = FALSE;
-    m_matchCase = FALSE;
+    m_matchWholeWord = false;
+    m_matchCase = false;

     m_defaultFileKind = wxT("Setup file");
 }
 
 // Copy constructor
     m_defaultFileKind = wxT("Setup file");
 }
 
 // Copy constructor

-ctSettings::ctSettings(const ctSettings& settings)
+ctSettings::ctSettings(const ctSettings& settings) : wxObject()

 {
     Copy(settings);
 }
 
 
 {
     Copy(settings);
 }
 
 

-ctSettings::~ctSettings()
-{
-}
-

 void ctSettings::operator = (const ctSettings& settings)
 {
     Copy(settings);
 void ctSettings::operator = (const ctSettings& settings)
 {
     Copy(settings);


@@ -126,17 +120,17 @@ void ctSettings::Copy (const ctSettings& settings)
 bool ctSettings::Init()
 {
     m_lastSetupSaveDir = wxEmptyString;
 bool ctSettings::Init()
 {
     m_lastSetupSaveDir = wxEmptyString;

-    if (m_userName.IsEmpty())
+    if (m_userName.empty())

         m_userName = wxGetUserName();
 
         m_userName = wxGetUserName();
 

-    return TRUE;
+    return true;

 }
 
 // Create new filename
 wxString ctSettings::GenerateFilename(const wxString& rootName)
 {
     wxString path;
 }
 
 // Create new filename
 wxString ctSettings::GenerateFilename(const wxString& rootName)
 {
     wxString path;

-    if (!m_lastFilename.IsEmpty())
+    if (!m_lastFilename.empty())

         path = wxPathOnly(m_lastFilename);
     else
         path = wxGetApp().GetAppDir();
         path = wxPathOnly(m_lastFilename);
     else
         path = wxGetApp().GetAppDir();


@@ -199,7 +193,7 @@ bool ctSettings::LoadConfig()
 
     fontSpec = wxEmptyString;
     config.Read(wxT("Style/EditWindowFont"), & fontSpec);
 
     fontSpec = wxEmptyString;
     config.Read(wxT("Style/EditWindowFont"), & fontSpec);

-    if (!fontSpec.IsEmpty())
+    if (!fontSpec.empty())

         m_editWindowFont = apStringToFont(fontSpec);
 
     // Crash-resistance
         m_editWindowFont = apStringToFont(fontSpec);
 
     // Crash-resistance


@@ -212,13 +206,13 @@ bool ctSettings::LoadConfig()
     // facility just in case it's trying to load a damaged file.
     if (runningProgram != 0)
     {
     // facility just in case it's trying to load a damaged file.
     if (runningProgram != 0)
     {

-        m_loadLastDocument = FALSE;
+        m_loadLastDocument = false;

     }
 #endif
 
     config.Write(wxT("Misc/RunningProgram"), (long) 1);
 
     }
 #endif
 
     config.Write(wxT("Misc/RunningProgram"), (long) 1);
 

-    return TRUE;
+    return true;

 }
 
 // Save config info
 }
 
 // Save config info


@@ -264,13 +258,13 @@ bool ctSettings::SaveConfig()
     // Indicate that we're no longer running, so we know if the program
     // crashed last time around.
     config.Write(wxT("Misc/RunningProgram"), (long) 0);
     // Indicate that we're no longer running, so we know if the program
     // crashed last time around.
     config.Write(wxT("Misc/RunningProgram"), (long) 0);

-   
+

     {
         config.SetPath(wxT("FileHistory/"));
         wxGetApp().GetDocManager()->FileHistorySave(config);
     }
 
     {
         config.SetPath(wxT("FileHistory/"));
         wxGetApp().GetDocManager()->FileHistorySave(config);
     }
 

-    return TRUE;
+    return true;

 }
 
 void ctSettings::ShowSettingsDialog(const wxString& WXUNUSED(page))
 }
 
 void ctSettings::ShowSettingsDialog(const wxString& WXUNUSED(page))