avoid infinite recursion for richtooltops, (hopefully) fixes #15070

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

diff --git a/interface/wx/toplevel.h b/interface/wx/toplevel.h
index 813925bf278dcf495fce1c0bc45701ba988e2aae..4cfa892bb7030ca31b9b669328351d25fadad8dd 100644 (file)
--- a/interface/wx/toplevel.h
+++ b/interface/wx/toplevel.h
@@ -34,6 +34,14 @@ enum
                           wxFULLSCREEN_NOCAPTION
 };
 
                           wxFULLSCREEN_NOCAPTION
 };
 

+#define wxDEFAULT_FRAME_STYLE (wxSYSTEM_MENU |          \
+                               wxRESIZE_BORDER |        \
+                               wxMINIMIZE_BOX |         \
+                               wxMAXIMIZE_BOX |         \
+                               wxCLOSE_BOX |            \
+                               wxCAPTION |              \
+                               wxCLIP_CHILDREN)
+

 /**
     @class wxTopLevelWindow
 
 /**
     @class wxTopLevelWindow
 


@@ -117,7 +125,7 @@ public:
     /**
         A synonym for CentreOnScreen().
     */
     /**
         A synonym for CentreOnScreen().
     */

-    void CenterOnScreen(int direction);
+    void CenterOnScreen(int direction = wxBOTH);

 
     /**
         Centres the window on screen.
 
     /**
         Centres the window on screen.


@@ -206,7 +214,7 @@ public:
     virtual void Iconize(bool iconize = true);
 
     /**
     virtual void Iconize(bool iconize = true);
 
     /**

-        Returns @true if this window is currently active, i.e. if the user is
+        Returns @true if this window is currently active, i.e.\ if the user is

         currently working with it.
     */
     virtual bool IsActive();
         currently working with it.
     */
     virtual bool IsActive();


@@ -495,6 +503,27 @@ public:
     */
     virtual bool OSXIsModified() const;
 
     */
     virtual bool OSXIsModified() const;
 

+    /**
+        Sets the file name represented by this wxTopLevelWindow.
+
+        Under OS X, this file name is used to set the "proxy icon", which
+        appears in the window title bar near its title, corresponding to this
+        file name. Under other platforms it currently doesn't do anything but
+        it is harmless to call it now and it might be implemented to do
+        something useful in the future so you're encouraged to use it for any
+        window representing a file-based document.
+
+        @since 2.9.4
+    */
+    virtual void SetRepresentedFilename(const wxString& filename);
+
+    /**
+        Show the wxTopLevelWindow, but do not give it keyboard focus. This can be
+        used for pop up or notification windows that should not steal the current
+        focus.
+     */
+    virtual void ShowWithoutActivating();
+    

     /**
         Depending on the value of @a show parameter the window is either shown
         full screen or restored to its normal state. @a style is a bit list
     /**
         Depending on the value of @a show parameter the window is either shown
         full screen or restored to its normal state. @a style is a bit list