Unselect all wxDataViewCtrl items when clicking outside of the item area.

[wxWidgets.git] / include / wx / osx / nonownedwnd.h

diff --git a/include/wx/osx/nonownedwnd.h b/include/wx/osx/nonownedwnd.h
index da7ede4551c41e3f12c74e01b10a2c9dd25bde5b..a972612b2bb7dea4148c81e103d3b52b2d0175d1 100644 (file)
--- a/include/wx/osx/nonownedwnd.h
+++ b/include/wx/osx/nonownedwnd.h
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        wx/mac/nonownedwnd.h
+// Name:        wx/osx/nonownedwnd.h

 // Purpose:     declares wxNonOwnedWindow class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2008-03-24
 // Purpose:     declares wxNonOwnedWindow class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2008-03-24

-// RCS-ID:      $Id: nonownedwnd.h 46993 2007-06-28 08:46:04Z VS $
+// RCS-ID:      $Id$

 // Copyright:   (c) 2008 Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2008 Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -14,6 +14,8 @@
 
 #include "wx/window.h"
 
 
 #include "wx/window.h"
 

+#include "wx/graphics.h"
+

 #if wxUSE_SYSTEM_OPTIONS
     #define wxMAC_WINDOW_PLAIN_TRANSITION wxT("mac.window-plain-transition")
 #endif
 #if wxUSE_SYSTEM_OPTIONS
     #define wxMAC_WINDOW_PLAIN_TRANSITION wxT("mac.window-plain-transition")
 #endif


@@ -30,7 +32,7 @@
 
 class wxNonOwnedWindowImpl;
 
 
 class wxNonOwnedWindowImpl;
 

-class WXDLLIMPEXP_CORE wxNonOwnedWindow : public wxWindow
+class WXDLLIMPEXP_CORE wxNonOwnedWindow : public wxNonOwnedWindowBase

 {
 public:
     // constructors and such
 {
 public:
     // constructors and such


@@ -55,8 +57,13 @@ public:
                 long style = 0,
                 const wxString& name = wxPanelNameStr);
 
                 long style = 0,
                 const wxString& name = wxPanelNameStr);
 

+    bool Create(wxWindow *parent, WXWindow nativeWindow);
+

     virtual ~wxNonOwnedWindow();
 
     virtual ~wxNonOwnedWindow();
 

+    virtual void SubclassWin(WXWindow nativeWindow);
+    virtual void UnsubclassWin();
+

     virtual wxPoint GetClientAreaOrigin() const;
 
     // implement base class pure virtuals
     virtual wxPoint GetClientAreaOrigin() const;
 
     // implement base class pure virtuals


@@ -74,7 +81,11 @@ public:
     // implementation from now on
     // --------------------------
 
     // implementation from now on
     // --------------------------
 

-    virtual bool DoSetShape(const wxRegion& region);
+    // These accessors are Mac-specific and don't exist in other ports.
+    const wxRegion& GetShape() const { return m_shape; }
+#if wxUSE_GRAPHICS_CONTEXT
+    const wxGraphicsPath& GetShapePath() { return m_shapePath; }
+#endif // wxUSE_GRAPHICS_CONTEXT

 
     // activation hooks only necessary for MDI Implementation
     static void MacDelayedDeactivation(long timestamp);
 
     // activation hooks only necessary for MDI Implementation
     static void MacDelayedDeactivation(long timestamp);


@@ -103,6 +114,10 @@ public:
     virtual void HandleResized( double timestampsec );
     virtual void HandleMoved( double timestampsec );
     virtual void HandleResizing( double timestampsec, wxRect* rect );
     virtual void HandleResized( double timestampsec );
     virtual void HandleMoved( double timestampsec );
     virtual void HandleResizing( double timestampsec, wxRect* rect );

+    
+    void WindowWasPainted();
+
+    virtual bool Destroy();

 
 protected:
     // common part of all ctors
 
 protected:
     // common part of all ctors


@@ -116,15 +131,28 @@ protected:
     virtual bool OSXShowWithEffect(bool show,
                                    wxShowEffect effect,
                                    unsigned timeout);
     virtual bool OSXShowWithEffect(bool show,
                                    wxShowEffect effect,
                                    unsigned timeout);

-    
-    void OnWindowDestroy( wxWindowDestroyEvent &event);
+
+    virtual bool DoClearShape();
+    virtual bool DoSetRegionShape(const wxRegion& region);
+#if wxUSE_GRAPHICS_CONTEXT
+    virtual bool DoSetPathShape(const wxGraphicsPath& path);
+#endif // wxUSE_GRAPHICS_CONTEXT
+
+    virtual void WillBeDestroyed();

 
     wxNonOwnedWindowImpl* m_nowpeer ;
 
 //    wxWindowMac* m_macFocus ;
 
     static wxNonOwnedWindow *s_macDeactivateWindow;
 
     wxNonOwnedWindowImpl* m_nowpeer ;
 
 //    wxWindowMac* m_macFocus ;
 
     static wxNonOwnedWindow *s_macDeactivateWindow;

+

 private :
 private :

+    static clock_t s_lastFlush;
+    
+    wxRegion m_shape;
+#if wxUSE_GRAPHICS_CONTEXT
+    wxGraphicsPath m_shapePath;
+#endif // wxUSE_GRAPHICS_CONTEXT

 };
 
 // list of all frames and modeless dialogs
 };
 
 // list of all frames and modeless dialogs