Applied patch [ 1039456 ] [wxOS2]Popup menu problems

[wxWidgets.git] / contrib / utils / wxrcedit / nodesdb.cpp

diff --git a/contrib/utils/wxrcedit/nodesdb.cpp b/contrib/utils/wxrcedit/nodesdb.cpp
index f36e6ed4c5895530e7aad78a871f391835ae45ce..46f11e35c5afbd06191cbad4873b138b43f8349a 100644 (file)
--- a/contrib/utils/wxrcedit/nodesdb.cpp
+++ b/contrib/utils/wxrcedit/nodesdb.cpp
@@ -34,22 +34,22 @@ void NodeInfo::Read(const wxString& filename, wxPathList& list)
 {
     wxString tp;
     wxString nd, cht;
 {
     wxString tp;
     wxString nd, cht;

-    bool ab = FALSE;
+    bool ab = false;

     long icn = -1;
 
     NodeClass.Empty();
 
     wxString path = list.FindValidPath(filename);
     if (path.IsEmpty()) return;
     long icn = -1;
 
     NodeClass.Empty();
 
     wxString path = list.FindValidPath(filename);
     if (path.IsEmpty()) return;

-    
+

     wxTextFile tf;
     tf.Open(path);
     wxTextFile tf;
     tf.Open(path);

-    
+

     if (!tf.IsOpened()) return;
 
     for (size_t i = 0; i < tf.GetLineCount(); i++)
     {
     if (!tf.IsOpened()) return;
 
     for (size_t i = 0; i < tf.GetLineCount(); i++)
     {

-        if (tf[i].IsEmpty() || tf[i][0] == _T('#')) continue;
+        if (tf[i].IsEmpty() || tf[i][0u] == _T('#')) continue;

         wxStringTokenizer tkn(tf[i], _T(' '));
         wxString s = tkn.GetNextToken();
         if (s == _T("node"))
         wxStringTokenizer tkn(tf[i], _T(' '));
         wxString s = tkn.GetNextToken();
         if (s == _T("node"))


@@ -80,8 +80,8 @@ void NodeInfo::Read(const wxString& filename, wxPathList& list)
             tkn.GetNextToken();
             pi.Type = tkn.GetNextToken();
             if (tkn.HasMoreTokens()) pi.MoreInfo = tkn.GetNextToken();
             tkn.GetNextToken();
             pi.Type = tkn.GetNextToken();
             if (tkn.HasMoreTokens()) pi.MoreInfo = tkn.GetNextToken();

-            
-            bool fnd = FALSE;
+
+            bool fnd = false;

             for (size_t j = 0; j < Props.GetCount(); j++)
             {
                 if (Props[j].Name == pi.Name)
             for (size_t j = 0; j < Props.GetCount(); j++)
             {
                 if (Props[j].Name == pi.Name)


@@ -90,14 +90,14 @@ void NodeInfo::Read(const wxString& filename, wxPathList& list)
                         Props[j].MoreInfo << _T(',') << pi.MoreInfo;
                     else
                         Props[j] = pi;
                         Props[j].MoreInfo << _T(',') << pi.MoreInfo;
                     else
                         Props[j] = pi;

-                    fnd = TRUE;
+                    fnd = true;

                 }
             }
                 }
             }

-            
+

             if (!fnd) Props.Add(pi);
         }
     }
             if (!fnd) Props.Add(pi);
         }
     }

-    
+

     if (!nd.IsEmpty()) NodeClass = nd;
     if (!cht.IsEmpty()) ChildType = cht;
     if (!!tp) Type = tp;
     if (!nd.IsEmpty()) NodeClass = nd;
     if (!cht.IsEmpty()) ChildType = cht;
     if (!!tp) Type = tp;


@@ -117,7 +117,7 @@ NodesDb* NodesDb::ms_Instance = NULL;
 
 NodesDb *NodesDb::Get()
 {
 
 NodesDb *NodesDb::Get()
 {

-    if (ms_Instance == NULL) 
+    if (ms_Instance == NULL)

     {
         (void)new NodesDb;
     }
     {
         (void)new NodesDb;
     }


@@ -131,7 +131,7 @@ NodesDb::NodesDb()
 
     m_Paths.Add(_T("."));
     m_Paths.Add(_T("./df"));
 
     m_Paths.Add(_T("."));
     m_Paths.Add(_T("./df"));

-#ifdef __UNIX__ 
+#ifdef __UNIX__

     m_Paths.Add(wxGetHomeDir() + _T("/.wxrcedit"));
     #ifdef wxINSTALL_PREFIX
     m_Paths.Add(wxINSTALL_PREFIX _T("/share/wx/wxrcedit"));
     m_Paths.Add(wxGetHomeDir() + _T("/.wxrcedit"));
     #ifdef wxINSTALL_PREFIX
     m_Paths.Add(wxINSTALL_PREFIX _T("/share/wx/wxrcedit"));


@@ -154,12 +154,12 @@ void NodesDb::Load()
 void NodesDb::LoadDir(const wxString& path)
 {
     if (!wxDirExists(path)) return;
 void NodesDb::LoadDir(const wxString& path)
 {
     if (!wxDirExists(path)) return;

-    
+

     wxDir dir(path);
     wxString filename;
     bool cont;
 
     wxDir dir(path);
     wxString filename;
     bool cont;
 

-    cont = dir.GetFirst(&filename, "*.df");
+    cont = dir.GetFirst(&filename, _T("*.df"));

     while (cont)
     {
         LoadFile(filename);
     while (cont)
     {
         LoadFile(filename);


@@ -171,20 +171,20 @@ void NodesDb::LoadDir(const wxString& path)
 
 void NodesDb::LoadFile(const wxString& file)
 {
 
 void NodesDb::LoadFile(const wxString& file)
 {

-    NodeInfo *ni = new NodeInfo; 
+    NodeInfo *ni = new NodeInfo;

     ni->Type = wxEmptyString;
     ni->Icon = 0;
     wxPathList paths;
     size_t i;
     ni->Type = wxEmptyString;
     ni->Icon = 0;
     wxPathList paths;
     size_t i;

-    
+

     for (i = 0; i < m_Paths.GetCount(); i++)
         paths.Add(m_Paths[i]);
     for (i = 0; i < m_Paths.GetCount(); i++)
         paths.Add(m_Paths[i]);

-    
+

     ni->Read(file, paths);
     ni->Read(file, paths);

-    
+

     // maybe we already parsed it?
     for (i = 0; i < m_Infos.GetCount(); i++)
         if (m_Infos[i].NodeClass == ni->NodeClass) return;
     // maybe we already parsed it?
     for (i = 0; i < m_Infos.GetCount(); i++)
         if (m_Infos[i].NodeClass == ni->NodeClass) return;

-    
+

     m_Infos.Add(ni);
 }
     m_Infos.Add(ni);
 }