Add wxDataViewEvent::IsEditCancelled() and support for vetoing edit events.

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

diff --git a/interface/wx/toplevel.h b/interface/wx/toplevel.h
index 5afa28037fbaf9afa196c0fb582e4448785eb689..55be716a7d228bc696e0213b7782eb12a8fe4413 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}


@@ -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,


@@ -286,6 +288,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.
 


@@ -438,7 +445,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.
     */