document the main event table macros, wxEventType, wxNewEventType; create a new group...

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

diff --git a/interface/wx/mdi.h b/interface/wx/mdi.h
index 8cf3e594e5dcf5474ea98584226519b747d24882..63119a136826aae0eaac6bf8f81fa563ab46a3bd 100644 (file)
--- a/interface/wx/mdi.h
+++ b/interface/wx/mdi.h
@@ -25,7 +25,7 @@
     be overridden in order to give an opportunity to use a different class of client
     window.
 
     be overridden in order to give an opportunity to use a different class of client
     window.
 

-    Under Windows 95, the client window will automatically have a sunken border style
+    Under wxMSW, the client window will automatically have a sunken border style

     when the active child is not maximized, and no border style when a child is maximized.
 
     @library{wxcore}
     when the active child is not maximized, and no border style when a child is maximized.
 
     @library{wxcore}


@@ -157,7 +157,7 @@ public:
 
         @remarks
 
 
         @remarks
 

-        Under Windows 95, the client window will automatically have a sunken
+        Under wxMSW, the client window will automatically have a sunken

         border style when the active child is not maximized, and no border
         style when a child is maximized.
 
         border style when the active child is not maximized, and no border
         style when a child is maximized.
 


@@ -168,7 +168,7 @@ public:
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,

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

 
     /**
         Destructor.
 
     /**
         Destructor.


@@ -234,14 +234,14 @@ public:
         If there are any children at all this function returns a non-@NULL
         pointer.
     */
         If there are any children at all this function returns a non-@NULL
         pointer.
     */

-    wxMDIChildFrame* GetActiveChild() const;
+    virtual wxMDIChildFrame* GetActiveChild() const;

 
     /**
         Returns a pointer to the client window.
 
         @see OnCreateClient()
     */
 
     /**
         Returns a pointer to the client window.
 
         @see OnCreateClient()
     */

-    wxWindow *GetClientWindow() const;
+    wxMDIClientWindowBase* GetClientWindow() const;

 
     /**
         Returns the current MDI Window menu.
 
     /**
         Returns the current MDI Window menu.


@@ -315,7 +315,7 @@ public:
         @param menu
             The menu to be used instead of the standard MDI Window menu or @NULL.
     */
         @param menu
             The menu to be used instead of the standard MDI Window menu or @NULL.
     */

-    void SetWindowMenu(wxMenu *menu);
+    virtual void SetWindowMenu(wxMenu* menu);

 
     /**
         Tiles the MDI child windows either horizontally or vertically depending
 
     /**
         Tiles the MDI child windows either horizontally or vertically depending


@@ -395,7 +395,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);

 
     /**
         Destructor. Destroys all child windows and menu bar if present.
 
     /**
         Destructor. Destroys all child windows and menu bar if present.