X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17e2694c5957fa82f3da9b338cd0937a98106005..77c8efc8c37da6d6a5e2e8022d21d1cd7d76371d:/include/wx/osx/nonownedwnd.h diff --git a/include/wx/osx/nonownedwnd.h b/include/wx/osx/nonownedwnd.h index 8a82458f8e..a972612b2b 100644 --- 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 -// RCS-ID: $Id: nonownedwnd.h 46993 2007-06-28 08:46:04Z VS $ +// RCS-ID: $Id$ // Copyright: (c) 2008 Stefan Csomor // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -14,6 +14,8 @@ #include "wx/window.h" +#include "wx/graphics.h" + #if wxUSE_SYSTEM_OPTIONS #define wxMAC_WINDOW_PLAIN_TRANSITION wxT("mac.window-plain-transition") #endif @@ -30,7 +32,7 @@ class wxNonOwnedWindowImpl; -class WXDLLIMPEXP_CORE wxNonOwnedWindow : public wxWindow +class WXDLLIMPEXP_CORE wxNonOwnedWindow : public wxNonOwnedWindowBase { public: // constructors and such @@ -56,9 +58,12 @@ public: const wxString& name = wxPanelNameStr); bool Create(wxWindow *parent, WXWindow nativeWindow); - + virtual ~wxNonOwnedWindow(); + virtual void SubclassWin(WXWindow nativeWindow); + virtual void UnsubclassWin(); + virtual wxPoint GetClientAreaOrigin() const; // implement base class pure virtuals @@ -76,8 +81,11 @@ public: // 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); @@ -107,8 +115,10 @@ public: virtual void HandleMoved( double timestampsec ); virtual void HandleResizing( double timestampsec, wxRect* rect ); + void WindowWasPainted(); + virtual bool Destroy(); - + protected: // common part of all ctors void Init(); @@ -121,7 +131,13 @@ protected: virtual bool OSXShowWithEffect(bool show, wxShowEffect effect, unsigned timeout); - + + 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 ; @@ -129,9 +145,14 @@ protected: // wxWindowMac* m_macFocus ; static wxNonOwnedWindow *s_macDeactivateWindow; - + 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