Harm's patch to fix a crash of wxPoem sample on termination

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

diff --git a/src/gtk/utilsres.cpp b/src/gtk/utilsres.cpp
index d14f938bde6ea1f43486f7aa0d289fdd44d9265e..fe447a9b1a7ac44f6885d6666ec91c6b68babe4d 100644 (file)
--- a/src/gtk/utilsres.cpp
+++ b/src/gtk/utilsres.cpp
@@ -249,20 +249,20 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
         wxXMergeDatabases();
 
     XrmDatabase database;
         wxXMergeDatabases();
 
     XrmDatabase database;

-    if (file) {
+    if ( !file.IsEmpty() ) {

         char buffer[500];
         // Is this right? Trying to get it to look in the user's
         // home directory instead of current directory -- JACS
         (void)GetIniFile(buffer, file);
 
         wxNode *node = (wxNode*) NULL;  /* suppress egcs warning */
         char buffer[500];
         // Is this right? Trying to get it to look in the user's
         // home directory instead of current directory -- JACS
         (void)GetIniFile(buffer, file);
 
         wxNode *node = (wxNode*) NULL;  /* suppress egcs warning */

-       node = wxTheResourceCache->Find(buffer);
+        node = wxTheResourceCache->Find(buffer);

         if (node)
         if (node)

-       {
+        {

             database = (XrmDatabase)node->Data();
             database = (XrmDatabase)node->Data();

-       }
-        else 
-       {
+        }
+        else
+        {

             database = XrmGetFileDatabase(buffer);
             wxLogTrace(wxTraceResAlloc, "Get: Number = %d", wxTheResourceCache->Number());
             wxTheResourceCache->Append(buffer, (wxObject *)database);
             database = XrmGetFileDatabase(buffer);
             wxLogTrace(wxTraceResAlloc, "Get: Number = %d", wxTheResourceCache->Number());
             wxTheResourceCache->Append(buffer, (wxObject *)database);

diff --git a/src/gtk1/utilsres.cpp b/src/gtk1/utilsres.cpp
index d14f938bde6ea1f43486f7aa0d289fdd44d9265e..fe447a9b1a7ac44f6885d6666ec91c6b68babe4d 100644 (file)
--- a/src/gtk1/utilsres.cpp
+++ b/src/gtk1/utilsres.cpp
@@ -249,20 +249,20 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
         wxXMergeDatabases();
 
     XrmDatabase database;
         wxXMergeDatabases();
 
     XrmDatabase database;

-    if (file) {
+    if ( !file.IsEmpty() ) {

         char buffer[500];
         // Is this right? Trying to get it to look in the user's
         // home directory instead of current directory -- JACS
         (void)GetIniFile(buffer, file);
 
         wxNode *node = (wxNode*) NULL;  /* suppress egcs warning */
         char buffer[500];
         // Is this right? Trying to get it to look in the user's
         // home directory instead of current directory -- JACS
         (void)GetIniFile(buffer, file);
 
         wxNode *node = (wxNode*) NULL;  /* suppress egcs warning */

-       node = wxTheResourceCache->Find(buffer);
+        node = wxTheResourceCache->Find(buffer);

         if (node)
         if (node)

-       {
+        {

             database = (XrmDatabase)node->Data();
             database = (XrmDatabase)node->Data();

-       }
-        else 
-       {
+        }
+        else
+        {

             database = XrmGetFileDatabase(buffer);
             wxLogTrace(wxTraceResAlloc, "Get: Number = %d", wxTheResourceCache->Number());
             wxTheResourceCache->Append(buffer, (wxObject *)database);
             database = XrmGetFileDatabase(buffer);
             wxLogTrace(wxTraceResAlloc, "Get: Number = %d", wxTheResourceCache->Number());
             wxTheResourceCache->Append(buffer, (wxObject *)database);