always call GTKSetActivatesDefault(), not only if wxTE_PROCESS_ENTER style was given...

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

diff --git a/src/gtk/utilsres.cpp b/src/gtk/utilsres.cpp
index cf8a946da7e89b3fc37e71f402ea65a6521cc9f8..bee27c4457a79ccc776fb8866d93db6dea6854ad 100644 (file)
--- a/src/gtk/utilsres.cpp
+++ b/src/gtk/utilsres.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        utilres.cpp
+// Name:        src/gtk/utilsres.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,16 +7,19 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-//#ifdef __GNUG__
-//#pragma implementation "utils.h"
-//#endif
+// 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/app.h"
 
 //-----------------------------------------------------------------------------
 // resource functions
@@ -25,12 +28,12 @@
 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 );
-    
+
     conf.SetPath( section );
-    
+
     return conf.Write( entry, value );
 }
 
@@ -58,28 +61,28 @@ bool wxWriteResource(const wxString& section, const wxString& entry, int value,
     return wxWriteResource(section, entry, buf, file);
 }
 
-bool wxGetResource(const wxString& section, const wxString& entry, char **value, const wxString& 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 );
-    
+
     conf.SetPath( section );
-    
+
     wxString result;
-    if (conf.Write( entry, &result ))
+    if (conf.Read( entry, &result ))
     {
-        if (!result.IsEmpty())
-       {
-            char *s = new char[result.Len()+1];
-           wxStrcpy( s, result.c_str() );
-           *value = s;
-           return TRUE;
-       }
+        if (!result.empty())
+        {
+            wxChar *s = new wxChar[result.Len()+1];
+            wxStrcpy( s, result.c_str() );
+            *value = s;
+            return true;
+        }
     }
-    
-    return FALSE;
+
+    return false;
 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file )
@@ -88,11 +91,11 @@ bool wxGetResource(const wxString& section, const wxString& entry, float *value,
     bool succ = wxGetResource(section, entry, (wxChar **)&s, file);
     if (succ)
     {
-        *value = (float)wxStrtod(s, NULL);
+        *value = (float)wxStrtod(s, (wchar_t**) 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 )
@@ -101,11 +104,11 @@ bool wxGetResource(const wxString& section, const wxString& entry, long *value,
     bool succ = wxGetResource(section, entry, (wxChar **)&s, file);
     if (succ)
     {
-        *value = wxStrtol(s, NULL, 10);
+        *value = wxStrtol(s, (wchar_t**) 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 )
@@ -114,10 +117,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
     bool succ = wxGetResource(section, entry, (wxChar **)&s, file);
     if (succ)
     {
-        *value = (int)wxStrtol(s, NULL, 10);
+        *value = (int)wxStrtol(s, (wchar_t**) NULL, 10);
         delete[] s;
-        return TRUE;
+        return true;
     }
-    else return FALSE;
+    else return false;
 }
-