fixed wrong return value and child creation login in GetWindowChild() (includes patch...

[wxWidgets.git] / src / gtk1 / utilsres.cpp

diff --git a/src/gtk1/utilsres.cpp b/src/gtk1/utilsres.cpp
index 69c6097176a2b36f26cb6aa70d3ff03a8f24c60f..aa8b739307bff9317c3cd4765fab0a132bf581e8 100644 (file)
--- a/src/gtk1/utilsres.cpp
+++ b/src/gtk1/utilsres.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        utilres.cpp
+// Name:        src/gtk1/utilsres.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,19 +7,19 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-//#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-//#pragma implementation "utils.h"
-//#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #include "wx/utils.h"
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #include "wx/utils.h"

-#include "wx/string.h"
-#include "wx/list.h"
-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/list.h"
+    #include "wx/string.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+#endif
+

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

-#include "wx/app.h"

 
 //-----------------------------------------------------------------------------
 // resource functions
 
 //-----------------------------------------------------------------------------
 // resource functions


@@ -28,12 +28,12 @@
 bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file )
 {
     wxString filename( file );
 bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file )
 {
     wxString filename( file );

-    if (filename.IsEmpty()) filename = wxT(".wxWindows");
-    
+    if (filename.empty()) filename = wxT(".wxWindows");
+

     wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
     wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );

-    
+

     conf.SetPath( section );
     conf.SetPath( section );

-    
+

     return conf.Write( entry, value );
 }
 
     return conf.Write( entry, value );
 }
 


@@ -64,7 +64,7 @@ bool wxWriteResource(const wxString& section, const wxString& entry, int value,
 bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file )
 {
     wxString filename( file );
 bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file )
 {
     wxString filename( file );

-    if (filename.IsEmpty()) filename = wxT(".wxWindows");
+    if (filename.empty()) filename = wxT(".wxWindows");

 
     wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
 
 
     wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
 


@@ -73,16 +73,16 @@ bool wxGetResource(const wxString& section, const wxString& entry, wxChar **valu
     wxString result;
     if (conf.Read( entry, &result ))
     {
     wxString result;
     if (conf.Read( entry, &result ))
     {

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

         {
             wxChar *s = new wxChar[result.Len()+1];
             wxStrcpy( s, result.c_str() );
             *value = s;
         {
             wxChar *s = new wxChar[result.Len()+1];
             wxStrcpy( s, result.c_str() );
             *value = s;

-            return TRUE;
+            return true;

         }
     }
 
         }
     }
 

-    return FALSE;
+    return false;

 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file )
 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file )


@@ -93,9 +93,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, float *value,
     {
         *value = (float)wxStrtod(s, NULL);
         delete[] s;
     {
         *value = (float)wxStrtod(s, NULL);
         delete[] s;

-        return TRUE;
+        return true;

     }
     }

-    else return FALSE;
+    else return false;

 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file )
 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file )


@@ -106,9 +106,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, long *value,
     {
         *value = wxStrtol(s, NULL, 10);
         delete[] s;
     {
         *value = wxStrtol(s, NULL, 10);
         delete[] s;

-        return TRUE;
+        return true;

     }
     }

-    else return FALSE;
+    else return false;

 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file )
 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file )


@@ -119,8 +119,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
     {
         *value = (int)wxStrtol(s, NULL, 10);
         delete[] s;
     {
         *value = (int)wxStrtol(s, NULL, 10);
         delete[] s;

-        return TRUE;
+        return true;

     }
     }

-    else return FALSE;
+    else return false;

 }
 }

-