Move code removing "-psn_xxx" command line arguments to common code.

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

diff --git a/interface/wx/docview.h b/interface/wx/docview.h
index 7f5a5ee99e274f5de8b2555f0edd7ac3b38d69d3..af3d47d9302ddd020a07a4e1d63cbaf3d7d83938 100644 (file)
--- a/interface/wx/docview.h
+++ b/interface/wx/docview.h
@@ -2,7 +2,6 @@
 // Name:        docview.h
 // Purpose:     interface of various doc/view framework classes
 // Author:      wxWidgets team
 // Name:        docview.h
 // Purpose:     interface of various doc/view framework classes
 // Author:      wxWidgets team

-// RCS-ID:      $Id$

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -557,6 +556,18 @@ public:
     */
     virtual wxDocTemplate* FindTemplateForPath(const wxString& path);
 
     */
     virtual wxDocTemplate* FindTemplateForPath(const wxString& path);
 

+    /**
+        Returns the view to apply a user command to.
+
+        This method tries to find the view that the user wants to interact
+        with. It returns the same view as GetCurrentDocument() if there is any
+        currently active view but falls back to the first view of the first
+        document if there is no active view.
+
+        @since 2.9.5
+     */
+    wxView* GetAnyUsableView() const;
+

     /**
         Returns the document associated with the currently active view (if
         any).
     /**
         Returns the document associated with the currently active view (if
         any).


@@ -564,7 +575,11 @@ public:
     wxDocument* GetCurrentDocument() const;
 
     /**
     wxDocument* GetCurrentDocument() const;
 
     /**

-        Returns the currently active view
+        Returns the currently active view.
+
+        This method can return @NULL if no view is currently active.
+
+        @see GetAnyUsableView()

     */
     virtual wxView* GetCurrentView() const;
 
     */
     virtual wxView* GetCurrentView() const;
 


@@ -1256,6 +1271,20 @@ public:
     /**
         Activate the first view of the document if any.
 
     /**
         Activate the first view of the document if any.
 

+        This function simply calls the Raise() method of the frame of the first
+        view. You may need to override the Raise() method to get the desired
+        effect if you are not using a standard wxFrame for your view. For
+        instance, if your document is inside its own notebook tab you could
+        implement Raise() like this:
+
+        @code
+        void MyNotebookPage::Raise()
+        {
+            wxNotebook* notebook = wxStaticCast(GetParent(), wxNotebook);
+            notebook->SetSelection(notebook->FindPage(this));
+        }
+        @endcode
+

         @see GetFirstView()
 
         @since 2.9.5
         @see GetFirstView()
 
         @since 2.9.5