Fixed wxRichTextCtrl base class

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

diff --git a/src/generic/dbgrptg.cpp b/src/generic/dbgrptg.cpp
index 8bac4199c789ebe3382aecf77dd62770a3609679..d959d0ea4f379a73456b6b3b85f3baab9efbf6dd 100644 (file)
--- a/src/generic/dbgrptg.cpp
+++ b/src/generic/dbgrptg.cpp
@@ -35,6 +35,7 @@
     #include "wx/stattext.h"
     #include "wx/filedlg.h"
     #include "wx/valtext.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"


@@ -62,7 +63,7 @@ private:
     // the text we show
     wxTextCtrl *m_text;
 
     // the text we show
     wxTextCtrl *m_text;
 

-    DECLARE_NO_COPY_CLASS(wxDumpPreviewDlg)
+    wxDECLARE_NO_COPY_CLASS(wxDumpPreviewDlg);

 };
 
 wxDumpPreviewDlg::wxDumpPreviewDlg(wxWindow *parent,
 };
 
 wxDumpPreviewDlg::wxDumpPreviewDlg(wxWindow *parent,


@@ -137,7 +138,7 @@ private:
 #endif // wxUSE_FILEDLG
 
     DECLARE_EVENT_TABLE()
 #endif // wxUSE_FILEDLG
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxDumpOpenExternalDlg)
+    wxDECLARE_NO_COPY_CLASS(wxDumpOpenExternalDlg);

 };
 
 BEGIN_EVENT_TABLE(wxDumpOpenExternalDlg, wxDialog)
 };
 
 BEGIN_EVENT_TABLE(wxDumpOpenExternalDlg, wxDialog)


@@ -271,7 +272,7 @@ private:
     wxArrayString m_files;
 
     DECLARE_EVENT_TABLE()
     wxArrayString m_files;
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxDebugReportDialog)
+    wxDECLARE_NO_COPY_CLASS(wxDebugReportDialog);

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -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')