Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

[wxWidgets.git] / interface / wx / debugrpt.h

diff --git a/interface/wx/debugrpt.h b/interface/wx/debugrpt.h
index 310b39a967099a43b637d0b7dc35fb3addf5fc17..77686c1ded6712d09598957fc9b3c491a24e3483 100644 (file)
--- a/interface/wx/debugrpt.h
+++ b/interface/wx/debugrpt.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxDebugReport*
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxDebugReport*
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -67,6 +67,44 @@ public:
     */
     wxDebugReportCompress();
 
     */
     wxDebugReportCompress();
 

+    /**
+        Set the directory where the debug report should be generated.
+
+        By default, the debug report is generated under user temporary files
+        directory. This is usually fine if it is meant to be processed in some
+        way (e.g. automatically uploaded to a remote server) but if the user is
+        asked to manually upload or send the report, it may be more convenient
+        to generate it in e.g. the users home directory and this function
+        allows to do this.
+
+        Notice that it should be called before wxDebugReport::Process() or it
+        has no effect.
+
+        @param dir
+            The full path to an existing directory where the debug report file
+            should be generated.
+
+        @since 2.9.1
+     */
+    void SetCompressedFileDirectory(const wxString& dir);
+
+    /**
+        Set the base name of the generated debug report file.
+
+        This function is similar to SetCompressedFileDirectory() but allows to
+        change the base name of the file. Notice that the file extension will
+        always be @c .zip.
+
+        By default, a unique name constructed from wxApp::GetAppName(), the
+        current process id and the current date and time is used.
+
+        @param name
+            The base name (i.e. without extension) of the file.
+
+        @since 2.9.1
+     */
+    void SetCompressedFileBaseName(const wxString& name);
+

     /**
         Returns the full path of the compressed file (empty if creation
         failed).
     /**
         Returns the full path of the compressed file (empty if creation
         failed).


@@ -182,9 +220,11 @@ public:
     /**
         Add another file to the report. If @a filename is an absolute path, it
         is copied to a file in the debug report directory with the same name.
     /**
         Add another file to the report. If @a filename is an absolute path, it
         is copied to a file in the debug report directory with the same name.

-        Otherwise the file should already exist in this directory
-        @a description only exists to be displayed to the user in the report
-        summary shown by wxDebugReportPreview.
+        Otherwise the file will be searched in the temporary directory returned
+        by GetDirectory().
+        
+        The argument @a description only exists to be displayed to the user in 
+        the report summary shown by wxDebugReportPreview.

 
         @see GetDirectory(), AddText()
     */
 
         @see GetDirectory(), AddText()
     */


@@ -201,30 +241,6 @@ public:
     bool AddText(const wxString& filename, const wxString& text,
                  const wxString& description);
 
     bool AddText(const wxString& filename, const wxString& text,
                  const wxString& description);
 

-    /**
-        This function may be overridden to add arbitrary custom context to the
-        XML context file created by AddContext(). By default, it does nothing.
-    */
-    virtual void DoAddCustomContext(wxXmlNode* nodeRoot);
-
-    /**
-        This function may be overridden to modify the contents of the exception
-        tag in the XML context file.
-    */
-    virtual bool DoAddExceptionInfo(wxXmlNode* nodeContext);
-
-    /**
-        This function may be overridden to modify the contents of the modules
-        tag in the XML context file.
-    */
-    virtual bool DoAddLoadedModules(wxXmlNode* nodeModules);
-
-    /**
-        This function may be overridden to modify the contents of the system
-        tag in the XML context file.
-    */
-    virtual bool DoAddSystemInfo(wxXmlNode* nodeSystemInfo);
-

     /**
         This method should be used to construct the full name of the files
         which you wish to add to the report using AddFile().
     /**
         This method should be used to construct the full name of the files
         which you wish to add to the report using AddFile().


@@ -237,7 +253,7 @@ public:
     /**
         Retrieves the name (relative to GetDirectory()) and the description of
         the file with the given index. If @a n is greater than or equal to the
     /**
         Retrieves the name (relative to GetDirectory()) and the description of
         the file with the given index. If @a n is greater than or equal to the

-        number of filse, @false is returned.
+        number of files, then @false is returned.

     */
     bool GetFile(size_t n, wxString* name, wxString* desc) const;
 
     */
     bool GetFile(size_t n, wxString* name, wxString* desc) const;
 


@@ -277,6 +293,32 @@ public:
         after this as it becomes uninitialized and invalid.
     */
     void Reset();
         after this as it becomes uninitialized and invalid.
     */
     void Reset();

+
+protected:
+
+    /**
+        This function may be overridden to add arbitrary custom context to the
+        XML context file created by AddContext(). By default, it does nothing.
+    */
+    virtual void DoAddCustomContext(wxXmlNode* nodeRoot);
+
+    /**
+        This function may be overridden to modify the contents of the exception
+        tag in the XML context file.
+    */
+    virtual bool DoAddExceptionInfo(wxXmlNode* nodeContext);
+
+    /**
+        This function may be overridden to modify the contents of the modules
+        tag in the XML context file.
+    */
+    virtual bool DoAddLoadedModules(wxXmlNode* nodeModules);
+
+    /**
+        This function may be overridden to modify the contents of the system
+        tag in the XML context file.
+    */
+    virtual bool DoAddSystemInfo(wxXmlNode* nodeSystemInfo);

 };
 
 
 };
 
 


@@ -335,6 +377,7 @@ public:
                         const wxString& action,
                         const wxString& curl = "curl");
 
                         const wxString& action,
                         const wxString& curl = "curl");
 

+protected:

     /**
         This function may be overridden in a derived class to show the output
         from curl: this may be an HTML page or anything else that the server
     /**
         This function may be overridden in a derived class to show the output
         from curl: this may be an HTML page or anything else that the server