Applied patch [ 875666 ] Warning free configtool util

ABX

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

diff --git a/utils/configtool/src/configtooldoc.cpp b/utils/configtool/src/configtooldoc.cpp
index 30588737ae380edea0103b78d38499102786b296..c2cb229ce8baf8773bd568a19ed5db9647c5d589 100644 (file)
--- a/utils/configtool/src/configtooldoc.cpp
+++ b/utils/configtool/src/configtooldoc.cpp
@@ -101,13 +101,11 @@ bool ctConfigToolDoc::OnCloseDocument()
 // Saves the doc
 bool ctConfigToolDoc::Save()
 {
-    bool ret = FALSE;
-
     if (!IsModified() && m_savedYet) return TRUE;
-    if (m_documentFile == wxT("") || !m_savedYet)
-        ret = SaveAs();
-    else
-        ret = OnSaveDocument(m_documentFile);
+
+    bool ret = (m_documentFile == wxT("") || !m_savedYet) ?
+                 SaveAs() :
+                 OnSaveDocument(m_documentFile);
     if ( ret )
         SetDocumentSaved(TRUE);
     return ret;

diff --git a/utils/configtool/src/mainframe.cpp b/utils/configtool/src/mainframe.cpp
index e2d828e3913e6420ae50f3da9eea89b8c1ee5891..ff22400c8207db01eba753240f5db4768db32ac4 100644 (file)
--- a/utils/configtool/src/mainframe.cpp
+++ b/utils/configtool/src/mainframe.cpp
@@ -98,7 +98,9 @@ ctMainFrame::ctMainFrame(wxDocManager *manager, wxFrame *parent, wxWindowID id,
     m_editMenu = NULL;
     m_configurePage = NULL;
     m_setupPage = NULL;
+#ifdef USE_CONFIG_BROWSER_PAGE
     m_configBrowserPage = NULL;
+#endif
     m_mainNotebook = NULL;
     m_findDialog = NULL;
 
@@ -118,13 +120,13 @@ ctMainFrame::ctMainFrame(wxDocManager *manager, wxFrame *parent, wxWindowID id,
     m_configurePage = new ctOutputWindow(m_mainNotebook, -1, wxDefaultPosition, wxSize(300, 200),
         wxNO_BORDER|wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN);
 
-#if 0
+#ifdef USE_CONFIG_BROWSER_PAGE
     m_configBrowserPage = new ctConfigurationBrowserWindow(m_mainNotebook, -1, wxDefaultPosition, wxSize(300, 200),
         wxNO_BORDER|wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN);
 #endif
 
     m_mainNotebook->AddPage(m_propertyEditor, _T("Properties"));
-#if 0
+#ifdef USE_CONFIG_BROWSER_PAGE
     m_mainNotebook->AddPage(m_configBrowserPage, _T("Configuration Browser"));
 #endif
     m_mainNotebook->AddPage(m_setupPage, _T("setup.h"));

diff --git a/utils/configtool/src/mainframe.h b/utils/configtool/src/mainframe.h
index d6ea7c4a748c3b93c416b4d633f7a84640380bac..a80dce014cd68792213c5e7a50d10e6333167f3f 100644 (file)
--- a/utils/configtool/src/mainframe.h
+++ b/utils/configtool/src/mainframe.h
@@ -19,6 +19,8 @@
 #include "wx/imaglist.h"
 #include "wx/docview.h"
 
+// #define USE_CONFIG_BROWSER_PAGE
+
 class WXDLLEXPORT wxHtmlWindow;
 class WXDLLEXPORT wxSplitterWindow;
 class WXDLLEXPORT wxNotebookEvent;
@@ -27,7 +29,9 @@ class ctConfigTreeCtrl;
 class ctPropertyEditor;
 class ctOutputWindow;
 class ctFindReplaceDialog;
+#ifdef USE_CONFIG_BROWSER_PAGE
 class ctConfigurationBrowserWindow;
+#endif
 
 /*!
  * \brief The main window of the application.
@@ -156,7 +160,9 @@ protected:
 
     // The control panel for browsing, adding and removing
     // configurations.
+#ifdef USE_CONFIG_BROWSER_PAGE
     ctConfigurationBrowserWindow*   m_configBrowserPage;
+#endif
 
     ctFindReplaceDialog*    m_findDialog;
 };

diff --git a/utils/configtool/src/utils.cpp b/utils/configtool/src/utils.cpp
index 389a8f26fbb4523970dfec3d7ce9066b379af79c..8af87a6d8e1e3e81d35ff3da626928df527656d2 100644 (file)
--- a/utils/configtool/src/utils.cpp
+++ b/utils/configtool/src/utils.cpp
@@ -77,12 +77,9 @@ wxString apColourToHexString(const wxColour& col)
 // Convert 6-digit hex string to a colour
 wxColour apHexStringToColour(const wxString& hex)
 {
-    unsigned int r = 0;
-    unsigned int g = 0;
-    unsigned int b = 0;
-    r = wxHexToDec(hex.Mid(0, 2));
-    g = wxHexToDec(hex.Mid(2, 2));
-    b = wxHexToDec(hex.Mid(4, 2));
+    unsigned int r = wxHexToDec(hex.Mid(0, 2));
+    unsigned int g = wxHexToDec(hex.Mid(2, 2));
+    unsigned int b = wxHexToDec(hex.Mid(4, 2));
 
     return wxColour(r, g, b);
 }
@@ -258,13 +255,10 @@ bool apInvokeAppForFile(const wxString& filename)
     }
 
     wxString cmd;
-    bool ok = ft->GetOpenCommand(&cmd,
-                                 wxFileType::MessageParameters(filename, _T("")));
+    ft->GetOpenCommand(&cmd, wxFileType::MessageParameters(filename, _T("")));
     delete ft;
 
-    ok = (wxExecute(cmd, FALSE) != 0);
-
-    return ok;
+    return (wxExecute(cmd, FALSE) != 0);
 }
 
 // Find the absolute path where this application has been run from.
@@ -521,11 +515,10 @@ bool ctMatchString(const wxString& matchAgainst, const wxString& matchText, bool
 
     wxString left(matchAgainst);
     bool success = FALSE;
-    int pos = 0;
     int matchTextLen = (int) matchText.Length();
     while (!success && !matchAgainst.IsEmpty())
     {
-        pos = left.Find(matchText);
+        int pos = left.Find(matchText);
         if (pos == -1)
             return FALSE;