Put gridg.h back so that it gets installed

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

diff --git a/src/gtk/utilsres.cpp b/src/gtk/utilsres.cpp
index 6082cd387e8063b352f780224c20b2ecb82e3614..c12f461e113e330e0668cf98d15724058a3ad27e 100644 (file)
--- a/src/gtk/utilsres.cpp
+++ b/src/gtk/utilsres.cpp
@@ -40,9 +40,9 @@
 // Yuck this is really BOTH site and platform dependent
 // so we should use some other strategy!
 #ifdef __SUN__
 // Yuck this is really BOTH site and platform dependent
 // so we should use some other strategy!
 #ifdef __SUN__

-    #define DEFAULT_XRESOURCE_DIR _T("/usr/openwin/lib/app-defaults")
+    #define DEFAULT_XRESOURCE_DIR wxT("/usr/openwin/lib/app-defaults")

 #else
 #else

-    #define DEFAULT_XRESOURCE_DIR _T("/usr/lib/X11/app-defaults")
+    #define DEFAULT_XRESOURCE_DIR wxT("/usr/lib/X11/app-defaults")

 #endif
 
 //-----------------------------------------------------------------------------
 #endif
 
 //-----------------------------------------------------------------------------


@@ -63,13 +63,13 @@ static wxChar *GetResourcePath(wxChar *buf, wxChar *name, bool create)
         wxStrcpy(buf, name);
         return buf; // Exists so ...
     }
         wxStrcpy(buf, name);
         return buf; // Exists so ...
     }

-    if (*name == _T('/'))
+    if (*name == wxT('/'))

         wxStrcpy(buf, name);
     else 
     {
         // Put in standard place for resource files if not absolute
         wxStrcpy(buf, DEFAULT_XRESOURCE_DIR);
         wxStrcpy(buf, name);
     else 
     {
         // Put in standard place for resource files if not absolute
         wxStrcpy(buf, DEFAULT_XRESOURCE_DIR);

-        wxStrcat(buf, _T("/"));
+        wxStrcat(buf, wxT("/"));

         wxStrcat(buf, FileNameFromPath(name));
     }
     if (create) 
         wxStrcat(buf, FileNameFromPath(name));
     }
     if (create) 


@@ -96,18 +96,18 @@ static wxChar *GetIniFile(wxChar *dest, const wxChar *filename)
       if ((home = wxGetUserHome(wxString())) != NULL)
       {
         wxStrcpy(dest, home);
       if ((home = wxGetUserHome(wxString())) != NULL)
       {
         wxStrcpy(dest, home);

-        if (dest[wxStrlen(dest) - 1] != _T('/')) wxStrcat(dest, _T("/"));
+        if (dest[wxStrlen(dest) - 1] != wxT('/')) wxStrcat(dest, wxT("/"));

         if (filename == NULL)
         {
         if (filename == NULL)
         {

-          if ((filename = wxGetenv(_T("XENVIRONMENT"))) == NULL) filename = _T(".Xdefaults");
+          if ((filename = wxGetenv(wxT("XENVIRONMENT"))) == NULL) filename = wxT(".Xdefaults");

         }
         else
         }
         else

-          if (*filename != _T('.')) wxStrcat(dest, _T("."));
+          if (*filename != wxT('.')) wxStrcat(dest, wxT("."));

         wxStrcat(dest, filename);
       }
       else
       {
         wxStrcat(dest, filename);
       }
       else
       {

-        dest[0] = _T('\0');
+        dest[0] = wxT('\0');

       }
     }
     return dest;
       }
     }
     return dest;


@@ -148,7 +148,7 @@ static void wxXMergeDatabases()
     // Open XENVIRONMENT file, or if not defined, the .Xdefaults,
     // and merge into existing database
 
     // Open XENVIRONMENT file, or if not defined, the .Xdefaults,
     // and merge into existing database
 

-    if ((environment = wxGetenv(_T("XENVIRONMENT"))) == NULL) 
+    if ((environment = wxGetenv(wxT("XENVIRONMENT"))) == NULL) 

     {
         size_t len;
 #if wxUSE_UNICODE
     {
         size_t len;
 #if wxUSE_UNICODE


@@ -203,7 +203,7 @@ void wxFlushResources()
 
 void wxDeleteResources(const wxChar *file)
 {
 
 void wxDeleteResources(const wxChar *file)
 {

-    wxLogTrace(wxTraceResAlloc, _T("Delete: Number = %d"), wxTheResourceCache->Number());
+    wxLogTrace(wxTraceResAlloc, wxT("Delete: Number = %d"), wxTheResourceCache->Number());

     wxChar buffer[500];
     (void)GetIniFile(buffer, file);
 
     wxChar buffer[500];
     (void)GetIniFile(buffer, file);
 


@@ -233,11 +233,11 @@ bool wxWriteResource(const wxString& section, const wxString& entry, const wxStr
         database = (XrmDatabase)node->Data();
     else {
         database = XrmGetFileDatabase(wxConvCurrent->cWX2MB(buffer));
         database = (XrmDatabase)node->Data();
     else {
         database = XrmGetFileDatabase(wxConvCurrent->cWX2MB(buffer));

-        wxLogTrace(wxTraceResAlloc, _T("Write: Number = %d"), wxTheResourceCache->Number());
+        wxLogTrace(wxTraceResAlloc, wxT("Write: Number = %d"), wxTheResourceCache->Number());

         wxTheResourceCache->Append(buffer, (wxObject *)database);
     }
     char resName[300];
         wxTheResourceCache->Append(buffer, (wxObject *)database);
     }
     char resName[300];

-    strcpy(resName, !section.IsNull() ? MBSTRINGCAST section.mb_str() : "wxWindows");
+    strcpy(resName, !section.IsNull() ? wxMBSTRINGCAST section.mb_str() : "wxWindows");

     strcat(resName, ".");
     strcat(resName, entry.mb_str());
     XrmPutStringResource(&database, resName, value.mb_str());
     strcat(resName, ".");
     strcat(resName, entry.mb_str());
     XrmPutStringResource(&database, resName, value.mb_str());


@@ -287,7 +287,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
         else
         {
             database = XrmGetFileDatabase(wxConvCurrent->cWX2MB(buffer));
         else
         {
             database = XrmGetFileDatabase(wxConvCurrent->cWX2MB(buffer));

-            wxLogTrace(wxTraceResAlloc, _T("Get: Number = %d"), wxTheResourceCache->Number());
+            wxLogTrace(wxTraceResAlloc, wxT("Get: Number = %d"), wxTheResourceCache->Number());

             wxTheResourceCache->Append(buffer, (wxObject *)database);
         }
     } else
             wxTheResourceCache->Append(buffer, (wxObject *)database);
         }
     } else