Move code removing "-psn_xxx" command line arguments to common code.

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

diff --git a/interface/wx/window.h b/interface/wx/window.h
index acf13d59180e1ac0afe8fb08d289877ec0fc3a39..361f34cd69725738c2a0f4e214f8f80751ad371d 100644 (file)
--- a/interface/wx/window.h
+++ b/interface/wx/window.h
@@ -2,7 +2,6 @@
 // Name:        window.h
 // Purpose:     interface of wxWindow
 // Author:      wxWidgets team
 // Name:        window.h
 // Purpose:     interface of wxWindow
 // Author:      wxWidgets team

-// RCS-ID:      $Id$

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -53,6 +52,16 @@ enum wxShowEffect
 };
 
 
 };
 
 

+/**
+   flags for SendSizeEvent()
+*/
+enum
+{
+    wxSEND_EVENT_POST = 1
+};
+
+
+

 
 /**
     Struct containing all the visual attributes of a control.
 
 /**
     Struct containing all the visual attributes of a control.


@@ -1109,7 +1118,7 @@ public:
 
        @since 2.9.5
     */
 
        @since 2.9.5
     */

-    virtual double GetMagnificationFactor() const;
+    virtual double GetContentScaleFactor() const;

     
     /**
         Returns the size of the left/right and top/bottom borders of this window in x
     
     /**
         Returns the size of the left/right and top/bottom borders of this window in x