X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1363811bb6338fb0dad6c16cfa47f46fb1eb3b99..2d17a4e2f1da0da3671c888f23ec68facb5074ef:/src/motif/utils.cpp

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index 287774c77b..65d6c32bec 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 <ctype.h>
 #include <stdarg.h>
@@ -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);
@@ -542,8 +541,8 @@ wxXSetBusyCursor (wxWindow * win, wxCursor * cursor)
     else
     {
         // Restore old cursor
-        if (win->GetCursor()->Ok())
-            attrs.cursor = (Cursor) win->GetCursor()->GetXCursor(display);
+        if (win->GetCursor().Ok())
+            attrs.cursor = (Cursor) win->GetCursor().GetXCursor(display);
         else
             attrs.cursor = None;
     }