X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2758e21753c00b8e36f11c003fd6cd0e5137391..c5d7b7d20ba810df4ad66f6826c529a106e81577:/include/wx/osx/nonownedwnd.h diff --git a/include/wx/osx/nonownedwnd.h b/include/wx/osx/nonownedwnd.h index eee92a7ea6..200a354682 100644 --- a/include/wx/osx/nonownedwnd.h +++ b/include/wx/osx/nonownedwnd.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/nonownedwnd.h +// Name: wx/osx/nonownedwnd.h // Purpose: declares wxNonOwnedWindow class // Author: Stefan Csomor // Modified by: @@ -55,8 +55,13 @@ public: long style = 0, 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 @@ -75,6 +80,7 @@ public: // -------------------------- virtual bool DoSetShape(const wxRegion& region); + const wxRegion& GetShape() const { return m_shape; } // activation hooks only necessary for MDI Implementation static void MacDelayedDeactivation(long timestamp); @@ -103,7 +109,7 @@ public: virtual void HandleResized( double timestampsec ); virtual void HandleMoved( double timestampsec ); virtual void HandleResizing( double timestampsec, wxRect* rect ); - + virtual bool Destroy(); protected: @@ -118,7 +124,7 @@ protected: virtual bool OSXShowWithEffect(bool show, wxShowEffect effect, unsigned timeout); - + virtual void WillBeDestroyed(); wxNonOwnedWindowImpl* m_nowpeer ; @@ -126,7 +132,9 @@ protected: // wxWindowMac* m_macFocus ; static wxNonOwnedWindow *s_macDeactivateWindow; + private : + wxRegion m_shape; }; // list of all frames and modeless dialogs