X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1363811bb6338fb0dad6c16cfa47f46fb1eb3b99..6aa55ce7277b3b5bd6da84a741d0270367678ab0:/src/motif/utils.cpp diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp index 287774c77b..47e93405ef 100644 --- a/src/motif/utils.cpp +++ b/src/motif/utils.cpp @@ -22,6 +22,7 @@ #include "wx/app.h" #include "wx/msgdlg.h" #include "wx/cursor.h" +#include "wx/window.h" // for wxTopLevelWindows #include #include @@ -60,8 +61,6 @@ static char *GetIniFile (char *dest, const char *filename); -extern wxList wxTopLevelWindows; - // ============================================================================ // implementation // ============================================================================ @@ -463,8 +462,8 @@ void wxXMergeDatabases (wxApp * theApp, Display * display) size_t len; environment = GetIniFile (filename, NULL); len = strlen (environment); - wxString hostname; - if ( wxGetHostName(hostname) ) + wxString hostname = wxGetHostName(); + if ( !!hostname ) strncat(environment, hostname, 1024 - len); } homeDB = XrmGetFileDatabase (environment);