Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW...

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

diff --git a/utils/configtool/src/appsettings.cpp b/utils/configtool/src/appsettings.cpp
index 69fd5a3d52bc6622444a3e0c2e1641d0f38958fd..17f4a0f70b1be62b0493948f47e88bc85363ed87 100644 (file)
--- a/utils/configtool/src/appsettings.cpp
+++ b/utils/configtool/src/appsettings.cpp
@@ -6,35 +6,36 @@
 // Created:     2002-09-04
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    
+// Licence:
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation appsettings.h
+#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
-#include "wx/wx.h"
-#endif
 
-#include "wx/wfstream.h"
 #include "wx/datstrm.h"
-#include "wx/config.h"
-#include "wx/fileconf.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"
 
+#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"
@@ -51,28 +52,31 @@ IMPLEMENT_DYNAMIC_CLASS(ctSettings, wxObject)
 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_editWindowFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
 
-    m_appName = wxT("wxWindows 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_loadLastDocument = TRUE;
-    m_firstTimeRun = TRUE;
-    m_smallToolbar = TRUE;
+    m_loadLastDocument = true;
+    m_firstTimeRun = true;
+    m_smallToolbar = true;
     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_matchWholeWord = false;
+    m_matchCase = false;
+    m_defaultFileKind = wxT("Setup file");
 }
 
 // Copy constructor
@@ -82,10 +86,6 @@ ctSettings::ctSettings(const ctSettings& settings)
 }
 
 
-ctSettings::~ctSettings()
-{
-}
-
 void ctSettings::operator = (const ctSettings& settings)
 {
     Copy(settings);
@@ -93,7 +93,7 @@ void ctSettings::operator = (const ctSettings& settings)
 
 void ctSettings::Copy (const ctSettings& settings)
 {
-    m_currentDocumentDir = settings.m_currentDocumentDir;
+    m_lastSetupSaveDir = settings.m_lastSetupSaveDir;
     m_lastDocument = settings.m_lastDocument;
     m_showToolBar = settings.m_showToolBar;
     m_frameSize = settings.m_frameSize;
@@ -114,16 +114,19 @@ void ctSettings::Copy (const ctSettings& settings)
 
     m_useEnvironmentVariable = settings.m_useEnvironmentVariable;
     m_frameworkDir = settings.m_frameworkDir;
+    m_matchWholeWord = settings.m_matchWholeWord;
+    m_matchCase = settings.m_matchCase;
+    m_defaultFileKind  = settings.m_defaultFileKind ;
 }
 
 // Do some initialisation within stApp::OnInit
 bool ctSettings::Init()
 {
-    m_currentDocumentDir = wxEmptyString;
+    m_lastSetupSaveDir = wxEmptyString;
     if (m_userName.IsEmpty())
         m_userName = wxGetUserName();
 
-    return TRUE;
+    return true;
 }
 
 // Create new filename
@@ -146,7 +149,7 @@ wxString ctSettings::GenerateFilename(const wxString& rootName)
     while (wxFileExists(fullFilename))
     {
         i ++;
-        postfixStr.Printf("%d", i);
+        postfixStr.Printf(_T("%d"), i);
         fullFilename = filename + postfixStr + wxT(".wxs");
     }
 
@@ -157,10 +160,10 @@ wxString ctSettings::GenerateFilename(const wxString& rootName)
 // Load config info
 bool ctSettings::LoadConfig()
 {
-    wxConfig config(wxGetApp().GetSettings().GetAppName(), wxT("wxWindows"));
+    wxConfig config(wxGetApp().GetSettings().GetAppName(), wxT("wxWidgets"));
 
     config.Read(wxT("Files/LastFile"), & m_lastFilename);
-    config.Read(wxT("Files/DocumentDir"), & m_currentDocumentDir);
+    config.Read(wxT("Files/LastSetupSaveDir"), & m_lastSetupSaveDir);
     config.Read(wxT("Files/ExportDir"), & m_exportDir);
     config.Read(wxT("Files/FrameworkDir"), & m_frameworkDir);
     config.Read(wxT("Files/UseEnvironmentVariable"), (bool*) & m_useEnvironmentVariable);
@@ -173,6 +176,9 @@ bool ctSettings::LoadConfig()
     config.Read(wxT("Misc/ShowWelcomeDialog"), (bool*) & m_showWelcomeDialog);
     config.Read(wxT("Misc/Ran"), & m_noUses);
     config.Read(wxT("Misc/ShowTrayIcon"), (bool*) & m_showTrayIcon);
+    config.Read(wxT("Misc/MatchWholeWord"), (bool*) & m_matchWholeWord);
+    config.Read(wxT("Misc/MatchCase"), (bool*) & m_matchCase);
+    config.Read(wxT("Misc/BuildMode"), & m_defaultFileKind );
 
     m_noUses ++;
 
@@ -203,22 +209,22 @@ bool ctSettings::LoadConfig()
     // 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);
 
-    return TRUE;
+    return true;
 }
 
 // Save config info
 bool ctSettings::SaveConfig()
 {
-    wxConfig config(wxGetApp().GetSettings().GetAppName(), wxT("wxWindows"));
+    wxConfig config(wxGetApp().GetSettings().GetAppName(), wxT("wxWidgets"));
 
     config.Write(wxT("Files/LastFile"), m_lastFilename);
-    config.Write(wxT("Files/DocumentDir"), m_currentDocumentDir);
+    config.Write(wxT("Files/LastSetupSaveDir"), m_lastSetupSaveDir);
     config.Write(wxT("Files/ExportDir"), m_exportDir);
     config.Write(wxT("Files/FrameworkDir"), m_frameworkDir);
     config.Write(wxT("Files/UseEnvironmentVariable"), m_useEnvironmentVariable);
@@ -231,6 +237,9 @@ bool ctSettings::SaveConfig()
     config.Write(wxT("Misc/ShowWelcomeDialog"), (long) m_showWelcomeDialog);
     config.Write(wxT("Misc/Ran"), m_noUses);
     config.Write(wxT("Misc/ShowTrayIcon"), (long) m_showTrayIcon);
+    config.Write(wxT("Misc/MatchWholeWord"), (long) m_matchWholeWord);
+    config.Write(wxT("Misc/MatchCase"), (long) m_matchCase);
+    config.Write(wxT("Misc/BuildMode"), m_defaultFileKind);
 
     config.Write(wxT("Windows/ShowToolBar"), m_showToolBar);
     config.Write(wxT("Windows/WindowX"), (long) m_frameSize.x);
@@ -252,16 +261,16 @@ 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);
-   
+
     {
         config.SetPath(wxT("FileHistory/"));
         wxGetApp().GetDocManager()->FileHistorySave(config);
     }
 
-    return TRUE;
+    return true;
 }
 
-void ctSettings::ShowSettingsDialog(const wxString& page)
+void ctSettings::ShowSettingsDialog(const wxString& WXUNUSED(page))
 {
     ctSettingsDialog* dialog = new ctSettingsDialog(wxGetApp().GetTopWindow());
 //    if (!page.IsEmpty())