Commited FRM's stockitem patch (empty stock items).

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

diff --git a/include/wx/window.h b/include/wx/window.h
index 338073b554e34e1c693ecb40f2ee19ee5cdf96e9..ad27c0c68ee1aaea0f73e6ae846bd2a581e68785 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1027,6 +1027,12 @@ public:
     wxAccessible* GetOrCreateAccessible() ;
 #endif
 
     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
     // --------------
 
     // implementation
     // --------------
 


@@ -1329,9 +1335,8 @@ protected:
     virtual void DoSetWindowVariant( wxWindowVariant variant ) ;
 
     // Must be called when mouse capture is lost to send
     virtual void DoSetWindowVariant( wxWindowVariant variant ) ;
 
     // Must be called when mouse capture is lost to send

-    // wxMouseCaptureLostEvent to windows on capture stack. The argument is
-    // the window gaining capture or NULL if outside of wx code or none.
-    static void NotifyCaptureLost(wxWindow *gainedCapture);
+    // wxMouseCaptureLostEvent to windows on capture stack.
+    static void NotifyCaptureLost();

 
 private:
     // contains the last id generated by NewControlId
 
 private:
     // contains the last id generated by NewControlId


@@ -1392,12 +1397,11 @@ private:
     #endif // wxUniv
     #include "wx/x11/window.h"
 #elif defined(__WXMGL__)
     #endif // wxUniv
     #include "wx/x11/window.h"
 #elif defined(__WXMGL__)

-    #ifdef __WXUNIVERSAL__
-        #define wxWindowNative wxWindowMGL
-    #else // !wxUniv
-        #define wxWindowMGL wxWindow
-    #endif // wxUniv
+    #define wxWindowNative wxWindowMGL

     #include "wx/mgl/window.h"
     #include "wx/mgl/window.h"

+#elif defined(__WXDFB__)
+    #define wxWindowNative wxWindowDFB
+    #include "wx/dfb/window.h"

 #elif defined(__WXMAC__)
     #ifdef __WXUNIVERSAL__
         #define wxWindowNative wxWindowMac
 #elif defined(__WXMAC__)
     #ifdef __WXUNIVERSAL__
         #define wxWindowNative wxWindowMac