X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/05939a8140e0d0003e8859745d5b381a5dbe0da5..910484a67ddd6eac7c2ec947fc9e2e71f95abb6e:/src/gtk1/utilsres.cpp?ds=sidebyside

diff --git a/src/gtk1/utilsres.cpp b/src/gtk1/utilsres.cpp
index 619a055713..fda2bf5e9d 100644
--- a/src/gtk1/utilsres.cpp
+++ b/src/gtk1/utilsres.cpp
@@ -15,13 +15,14 @@
 #include "wx/utils.h"
 #include "wx/string.h"
 #include "wx/list.h"
+#include "wx/log.h"
 
 #include <ctype.h>
 #include <string.h>
 #include <unistd.h>
-#ifdef __SVR4__
-#include <sys/systeminfo.h>
-#endif
+//#ifdef __SVR4__
+//#include <sys/systeminfo.h>
+//#endif
 
 #include "gdk/gdkx.h"        // GDK_DISPLAY
 #include "gdk/gdkprivate.h"  // gdk_progclass
@@ -30,7 +31,6 @@
 #include <X11/Xutil.h>
 #include <X11/Xresource.h>
 
-#include "wx/log.h"
 
 //-----------------------------------------------------------------------------
 // constants
@@ -74,7 +74,7 @@ static wxChar *GetResourcePath(wxChar *buf, wxChar *name, bool create)
     if (create) 
     {
         // Touch the file to create it
-        FILE *fd = fopen(wxConv_file.cWX2MB(buf), "w");
+        FILE *fd = fopen(wxConvCurrent->cWX2MB(buf), "w");
         if (fd) fclose(fd);
     }
     return buf;
@@ -85,7 +85,7 @@ static wxChar *GetResourcePath(wxChar *buf, wxChar *name, bool create)
 // the Real User, then determine the Real home dir.
 static wxChar *GetIniFile(wxChar *dest, const wxChar *filename)
 {
-    wxChar *home = (wxChar *) NULL;
+    const wxChar *home = (const wxChar *) NULL;
     if (filename && wxIsAbsolutePath(filename))
     {
       wxStrcpy(dest, filename);
@@ -139,7 +139,7 @@ static void wxXMergeDatabases()
     else 
     {
         (void)GetIniFile(filename, (wxChar *) NULL);
-        serverDB = XrmGetFileDatabase(wxConv_file.cWX2MB(filename));
+        serverDB = XrmGetFileDatabase(wxConvCurrent->cWX2MB(filename));
     }
     if (serverDB)
         XrmMergeDatabases(serverDB, &wxResourceDatabase);
@@ -169,10 +169,10 @@ static void wxXMergeDatabases()
 #endif
 #endif
 #if wxUSE_UNICODE
-	wxStrcat(environment, wxConv_libc.cMB2WX(hostbuf));
+	wxStrcat(environment, wxConvCurrent->cMB2WX(hostbuf));
 #endif
     }
-    if ((homeDB = XrmGetFileDatabase(wxConv_file.cWX2MB(environment))))
+    if ((homeDB = XrmGetFileDatabase(wxConvCurrent->cWX2MB(environment))))
         XrmMergeDatabases(homeDB, &wxResourceDatabase);
 }
 
@@ -192,7 +192,7 @@ void wxFlushResources()
         (void)GetResourcePath(nameBuffer, file, TRUE);
 
         XrmDatabase database = (XrmDatabase)node->Data();
-        XrmPutFileDatabase(database, wxConv_file.cWX2MB(nameBuffer));
+        XrmPutFileDatabase(database, wxConvCurrent->cWX2MB(nameBuffer));
         XrmDestroyDatabase(database);
         wxNode *next = node->Next();
 //        delete node;
@@ -231,7 +231,7 @@ bool wxWriteResource(const wxString& section, const wxString& entry, const wxStr
     if (node)
         database = (XrmDatabase)node->Data();
     else {
-        database = XrmGetFileDatabase(wxConv_file.cWX2MB(buffer));
+        database = XrmGetFileDatabase(wxConvCurrent->cWX2MB(buffer));
         wxLogTrace(wxTraceResAlloc, _T("Write: Number = %d"), wxTheResourceCache->Number());
         wxTheResourceCache->Append(buffer, (wxObject *)database);
     }
@@ -285,7 +285,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
         }
         else
         {
-            database = XrmGetFileDatabase(wxConv_file.cWX2MB(buffer));
+            database = XrmGetFileDatabase(wxConvCurrent->cWX2MB(buffer));
             wxLogTrace(wxTraceResAlloc, _T("Get: Number = %d"), wxTheResourceCache->Number());
             wxTheResourceCache->Append(buffer, (wxObject *)database);
         }