Update wxGrid unit tests after r70177.

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

diff --git a/interface/wx/toplevel.h b/interface/wx/toplevel.h
index 5afa28037fbaf9afa196c0fb582e4448785eb689..813925bf278dcf495fce1c0bc45701ba988e2aae 100644 (file)
--- a/interface/wx/toplevel.h
+++ b/interface/wx/toplevel.h
@@ -46,7 +46,7 @@ enum
     internal top level window list.
 
     @beginEventEmissionTable
     internal top level window list.
 
     @beginEventEmissionTable

-    @event{EVT_ACTIVATE(id, func)}
+    @event{EVT_MAXIMIZE(id, func)}

         Process a @c wxEVT_MAXIMIZE event. See wxMaximizeEvent.
     @event{EVT_MOVE(func)}
         Process a @c wxEVT_MOVE event, which is generated when a window is moved.
         Process a @c wxEVT_MAXIMIZE event. See wxMaximizeEvent.
     @event{EVT_MOVE(func)}
         Process a @c wxEVT_MOVE event, which is generated when a window is moved.


@@ -59,6 +59,8 @@ enum
         Process a @c wxEVT_MOVE_END event, which is generated when the user stops
         moving or sizing a window. wxMSW only.
         See wxMoveEvent.
         Process a @c wxEVT_MOVE_END event, which is generated when the user stops
         moving or sizing a window. wxMSW only.
         See wxMoveEvent.

+    @event{EVT_SHOW(func)}
+        Process a @c wxEVT_SHOW event. See wxShowEvent.

     @endEventTable
 
     @library{wxcore}
     @endEventTable
 
     @library{wxcore}


@@ -66,7 +68,7 @@ enum
 
     @see wxDialog, wxFrame
 */
 
     @see wxDialog, wxFrame
 */

-class wxTopLevelWindow : public wxWindow
+class wxTopLevelWindow : public wxNonOwnedWindow

 {
 public:
     /**
 {
 public:
     /**


@@ -78,7 +80,7 @@ public:
         Constructor creating the top level window.
     */
     wxTopLevelWindow(wxWindow *parent,
         Constructor creating the top level window.
     */
     wxTopLevelWindow(wxWindow *parent,

-                    wxWindowID winid,
+                    wxWindowID id,

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


@@ -260,6 +262,33 @@ public:
     */
     virtual void Maximize(bool maximize = true);
 
     */
     virtual void Maximize(bool maximize = true);
 

+    /**
+        MSW-specific function for accessing the system menu.
+
+        Returns a wxMenu pointer representing the system menu of the window
+        under MSW. The returned wxMenu may be used, if non-@c NULL, to add
+        extra items to the system menu. The usual @c wxEVT_COMMAND_MENU_SELECTED
+        events (that can be processed using @c EVT_MENU event table macro) will
+        then be generated for them. All the other wxMenu methods may be used as
+        well but notice that they won't allow you to access any standard system
+        menu items (e.g. they can't be deleted or modified in any way
+        currently).
+
+        Notice that because of the native system limitations the identifiers of
+        the items added to the system menu must be multiples of 16, otherwise
+        no events will be generated for them.
+
+        The returned pointer must @em not be deleted, it is owned by the window
+        and will be only deleted when the window itself is destroyed.
+
+        This function is not available in the other ports by design, any
+        occurrences of it in the portable code must be guarded by
+        @code #ifdef __WXMSW__ @endcode preprocessor guards.
+
+        @since 2.9.3
+     */
+    wxMenu *MSWGetSystemMenu() const;
+

     /**
         Use a system-dependent way to attract users attention to the window when
         it is in background.
     /**
         Use a system-dependent way to attract users attention to the window when
         it is in background.


@@ -286,6 +315,11 @@ public:
     */
     wxWindow* SetDefaultItem(wxWindow* win);
 
     */
     wxWindow* SetDefaultItem(wxWindow* win);
 

+    
+    wxWindow*  SetTmpDefaultItem(wxWindow * win);
+    wxWindow* GetTmpDefaultItem() const;
+
+    

     /**
         Sets the icon for this window.
 
     /**
         Sets the icon for this window.
 


@@ -364,15 +398,6 @@ public:
                       const wxString& label = wxEmptyString,
                       wxMenu* subMenu = NULL);
 
                       const wxString& label = wxEmptyString,
                       wxMenu* subMenu = NULL);
 

-    /**
-        If the platform supports it, sets the shape of the window to that
-        depicted by @a region. The system will not display or respond to any
-        mouse event for the pixels that lie outside of the region. To reset the
-        window to the normal rectangular shape simply call SetShape() again with
-        an empty wxRegion. Returns @true if the operation is successful.
-    */
-    virtual bool SetShape(const wxRegion& region);
-

     /**
         Allows specification of minimum and maximum window sizes, and window
         size increments. If a pair of values is not set (or set to -1), no
     /**
         Allows specification of minimum and maximum window sizes, and window
         size increments. If a pair of values is not set (or set to -1), no


@@ -438,7 +463,7 @@ public:
 
         @param alpha
             Determines how opaque or transparent the window will be, if the
 
         @param alpha
             Determines how opaque or transparent the window will be, if the

-            platform supports the opreration. A value of 0 sets the window to be
+            platform supports the operation. A value of 0 sets the window to be

             fully transparent, and a value of 255 sets the window to be fully
             opaque.
     */
             fully transparent, and a value of 255 sets the window to be fully
             opaque.
     */