fixing text matrix (dataview custom renderer showed problems) and reordering SaveGState

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

diff --git a/interface/wx/docmdi.h b/interface/wx/docmdi.h
index 92b5029803215a15bc55eeda23b39fe3525d17b0..a5688dc186020bf190548e52c889aa78dbdd0ffa 100644 (file)
--- a/interface/wx/docmdi.h
+++ b/interface/wx/docmdi.h
@@ -35,7 +35,7 @@ public:
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = wxDEFAULT_FRAME_STYLE,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = wxDEFAULT_FRAME_STYLE,

-                        const wxString& name = "frame");
+                        const wxString& name = wxFrameNameStr);

     //@}
 
     /**
     //@}
 
     /**


@@ -51,7 +51,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,

-                const wxString& name = "frame");
+                const wxString& name = wxFrameNameStr);

 
     /**
         Deletes all views and documents. If no user input cancelled the
 
     /**
         Deletes all views and documents. If no user input cancelled the


@@ -100,12 +100,12 @@ public:
         Constructor.
     */
     wxDocMDIChildFrame(wxDocument* doc, wxView* view,
         Constructor.
     */
     wxDocMDIChildFrame(wxDocument* doc, wxView* view,

-                       wxFrame* parent, wxWindowID id,
+                       wxMDIParentFrame* parent, wxWindowID id,

                        const wxString& title,
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
                        long style = wxDEFAULT_FRAME_STYLE,
                        const wxString& title,
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
                        long style = wxDEFAULT_FRAME_STYLE,

-                       const wxString& name = "frame");
+                       const wxString& name = wxFrameNameStr);

 
     /**
         Destructor.
 
     /**
         Destructor.


@@ -127,7 +127,7 @@ public:
         to override (but still call) this function in order to set the keyboard
         focus for your subwindow.
     */
         to override (but still call) this function in order to set the keyboard
         focus for your subwindow.
     */

-    void OnActivate(wxActivateEvent event);
+    void OnActivate(wxActivateEvent& event);

 
     /**
         Closes and deletes the current view and document.
 
     /**
         Closes and deletes the current view and document.