slightly more intelligent size calculation to prevent clipping of text

[wxWidgets.git] / src / motif / utils.cpp

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index 287774c77be47d8f5fc5c6ab433a60a17829b26a..65d6c32becad7c80410e643bd4a7c30697efdcad 100644 (file)
--- 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/app.h"
 #include "wx/msgdlg.h"
 #include "wx/cursor.h"

+#include "wx/window.h" // for wxTopLevelWindows

 
 #include <ctype.h>
 #include <stdarg.h>
 
 #include <ctype.h>
 #include <stdarg.h>


@@ -60,8 +61,6 @@
 
 static char *GetIniFile (char *dest, const char *filename);
 
 
 static char *GetIniFile (char *dest, const char *filename);
 

-extern wxList wxTopLevelWindows;
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -463,8 +462,8 @@ void wxXMergeDatabases (wxApp * theApp, Display * display)
         size_t len;
         environment = GetIniFile (filename, NULL);
         len = strlen (environment);
         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);
             strncat(environment, hostname, 1024 - len);
     }
     homeDB = XrmGetFileDatabase (environment);


@@ -542,8 +541,8 @@ wxXSetBusyCursor (wxWindow * win, wxCursor * cursor)
     else
     {
         // Restore old 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;
     }
         else
             attrs.cursor = None;
     }