Move CanSetTransparent and SetTransparent up to wxWindowBase since

wxMac can handle transparency at that level.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index e9be5bb46048319e86db63c196cf9625a3ba9d31..2c601c70c51c3dd9a59102fe5e63220eb65b2149 100644 (file)
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -196,10 +196,6 @@ public:
     void CentreOnScreen(int dir = wxBOTH) { DoCentre(dir | wxCENTRE_ON_SCREEN); }
     void CenterOnScreen(int dir = wxBOTH) { CentreOnScreen(dir); }
 
-    // Set window transparency if the platform supports it
-    virtual bool SetTransparent(wxByte WXUNUSED(alpha)) { return false; }
-    virtual bool CanSetTransparent() { return false; }
-
 
     // default item access: we have a permanent default item which is the one
     // set by the user code but we may also have a temporary default item which

diff --git a/include/wx/window.h b/include/wx/window.h
index 6efb7a02497e65633ce96223c800d22312df2558..00aac0051815cb9d3e7a40a6d270b50ce8a7e0d7 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1027,6 +1027,12 @@ public:
     wxAccessible* GetOrCreateAccessible() ;
 #endif
 
+    
+    // Set window transparency if the platform supports it
+    virtual bool SetTransparent(wxByte WXUNUSED(alpha)) { return false; }
+    virtual bool CanSetTransparent() { return false; }
+
+
     // implementation
     // --------------
 

diff --git a/wxPython/src/_toplvl.i b/wxPython/src/_toplvl.i
index 8bdbbb2a012d01a4f9bfc975f7b5e260edb7296f..836b7dd90ca9c41bb7440194755e1f7970a6f463 100644 (file)
--- a/wxPython/src/_toplvl.i
+++ b/wxPython/src/_toplvl.i
@@ -176,9 +176,6 @@ public:
     }
 #endif
 
-    virtual bool SetTransparent(byte alpha); 
-    virtual bool CanSetTransparent();
-
     
     
     DocDeclStr(
@@ -366,11 +363,15 @@ public:
     void SetReturnCode(int returnCode);
     int GetReturnCode() const;
 
-    // The identifier for the affirmative button
+    // Set the identifier for the affirmative button: this button will close
+    // the dialog after validating data and calling TransferDataFromWindow()
     void SetAffirmativeId(int affirmativeId);
     int GetAffirmativeId() const;
 
-    // Identifier for Esc key translation
+    // Set identifier for Esc key translation: the button with this id will
+    // close the dialog without doing anything else; special value wxID_NONE
+    // means to not handle Esc at all while wxID_ANY means to map Esc to
+    // wxID_CANCEL if present and GetAffirmativeId() otherwise
     void SetEscapeId(int escapeId);
     int GetEscapeId() const;
 

diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i
index 2f0ebf8636735cfe63e4328e1661571d8e9bac93..97d4150f966cc62a3049ce8517a3a4d3e8dd2477 100644 (file)
--- a/wxPython/src/_window.i
+++ b/wxPython/src/_window.i
@@ -1981,6 +1981,26 @@ from the parent window.
 The base class version returns false, but this method is overridden in
 wxControl where it returns true.", "");
     
+
+
+    DocDeclStr(
+        virtual bool , CanSetTransparent(),
+        "Returns ``True`` if the platform supports setting the transparency for
+this window.  Note that this method will err on the side of caution,
+so it is possible that this will return ``False`` when it is in fact
+possible to set the transparency.
+
+NOTE: On X-windows systems the X server must have the composite
+extension loaded, and there must be a composite manager program (such
+as xcompmgr) running.", "");
+
+    DocDeclStr(
+        virtual bool , SetTransparent(byte alpha),
+        "Attempt to set the transparency of this window to the ``alpha`` value,
+returns True on success.  The ``alpha`` value is an integer in the
+range of 0 to 255, where 0 is fully transparent and 255 is fully
+opaque.", "");
+    
     
 
     %pythoncode {