Move code that does not need realized GdkWinow out of realize handler

[wxWidgets.git] / src / unix / stdpaths.cpp

diff --git a/src/unix/stdpaths.cpp b/src/unix/stdpaths.cpp
index 4089a9e06eb917a8f5a3467e833ebfff79e64ba6..4e0c37b18f1febcd0e7e256e1b2fd9a3b18b0761 100644 (file)
--- a/src/unix/stdpaths.cpp
+++ b/src/unix/stdpaths.cpp
@@ -1,12 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        unix/stdpaths.cpp
+// Name:        src/unix/stdpaths.cpp
 // Purpose:     wxStandardPaths implementation for Unix & OpenVMS systems
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-10-19
-// RCS-ID:      $Id$
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
-// License:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -122,7 +121,7 @@ wxString wxStandardPaths::GetExecutablePath() const
     wxString exeStr;
 
     char buf[4096];
-    int result = readlink("/proc/self/exe", buf, WXSIZEOF(buf) - sizeof(char));
+    int result = readlink("/proc/self/exe", buf, WXSIZEOF(buf) - 1);
     if ( result != -1 )
     {
         buf[result] = '\0'; // readlink() doesn't NUL-terminate the buffer
@@ -197,7 +196,11 @@ wxString wxStandardPaths::GetDataDir() const
     // practice for running well-written (and so using wxStandardPaths to find
     // their files) wx applications without installing them
     static const wxString
-      envOverride(getenv("WX_" + wxTheApp->GetAppName().Upper() + "_DATA_DIR"));
+      envOverride(
+        getenv(
+            ("WX_" + wxTheApp->GetAppName().Upper() + "_DATA_DIR").c_str()
+        )
+      );
 
     if ( !envOverride.empty() )
         return envOverride;