extract wrapper for SystemParametersInfo(SPI_GETNONCLIENTMETRICS) in a header so...

[wxWidgets.git] / src / generic / dbgrptg.cpp

diff --git a/src/generic/dbgrptg.cpp b/src/generic/dbgrptg.cpp
index 10b34cc7e0cc05b9cd890c1c7ba98e31a7663b40..f809ca1cd3a1aec527096270cb62fcc0f4dfba2d 100644 (file)
--- a/src/generic/dbgrptg.cpp
+++ b/src/generic/dbgrptg.cpp
@@ -33,6 +33,9 @@
     #include "wx/textctrl.h"
     #include "wx/intl.h"
     #include "wx/stattext.h"
     #include "wx/textctrl.h"
     #include "wx/intl.h"
     #include "wx/stattext.h"

+    #include "wx/filedlg.h"
+    #include "wx/valtext.h"
+    #include "wx/button.h"

 #endif // WX_PRECOMP
 
 #include "wx/filename.h"
 #endif // WX_PRECOMP
 
 #include "wx/filename.h"


@@ -40,8 +43,6 @@
 #include "wx/mimetype.h"
 
 #include "wx/statline.h"
 #include "wx/mimetype.h"
 
 #include "wx/statline.h"

-#include "wx/filedlg.h"
-#include "wx/valtext.h"

 
 #ifdef __WXMSW__
     #include "wx/evtloop.h"     // for SetCriticalWindow()
 
 #ifdef __WXMSW__
     #include "wx/evtloop.h"     // for SetCriticalWindow()


@@ -301,9 +302,18 @@ wxDebugReportDialog::wxDebugReportDialog(wxDebugReport& dbgrpt)
 {
     // upper part of the dialog: explanatory message
     wxString msg;
 {
     // upper part of the dialog: explanatory message
     wxString msg;

+    wxString debugDir = dbgrpt.GetDirectory();
+
+    // The temporary directory can be the short form on Windows;
+    // normalize it for the benefit of users.
+#ifdef __WXMSW__
+    wxFileName debugDirFilename(debugDir, wxEmptyString);
+    debugDirFilename.Normalize(wxPATH_NORM_LONG);
+    debugDir = debugDirFilename.GetPath();
+#endif

     msg << _("A debug report has been generated in the directory\n")
         << _T('\n')
     msg << _("A debug report has been generated in the directory\n")
         << _T('\n')

-        << _T("             \"") << dbgrpt.GetDirectory() << _T("\"\n")
+        << _T("             \"") << debugDir << _T("\"\n")

         << _T('\n')
         << _("The report contains the files listed below. If any of these files contain private information,\nplease uncheck them and they will be removed from the report.\n")
         << _T('\n')
         << _T('\n')
         << _("The report contains the files listed below. If any of these files contain private information,\nplease uncheck them and they will be removed from the report.\n")
         << _T('\n')