Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added zillions of #if wxUSE_XXX

Browse Source 
Removed cmndlgs usage of wxSizer and constraints
  Changed occurences of wxConv_xxx to wxConvXxxx and
    changed some wxConvLibc to wxConvCurrent
  Added Unicode tests to typetests (not finished)
  Compile fix for wxString in Unicode mode - we have
   to use the "experimental" printf then, I guess.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-06-14 23:04:05 +00:00
parent 9f50f9f1a1
commit dcf924a345
119 changed files with 845 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gtk1/utilsres.cpp
View File

@@ -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;
@@ -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);
}