Extend history api using the ie backend to include loading history items, and getting...

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

diff --git a/include/wx/osx/nonownedwnd.h b/include/wx/osx/nonownedwnd.h
index eee92a7ea6006f5bcc8794e05b447f12cebb6821..3eb1b2e1f0f96b68cbdeff7ca4b4751b29a1c6ab 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
 ///////////////////////////////////////////////////////////////////////////////


@@ -55,8 +55,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


@@ -75,6 +80,7 @@ public:
     // --------------------------
 
     virtual bool DoSetShape(const wxRegion& region);
     // --------------------------
 
     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);
 
     // 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 void HandleResized( double timestampsec );
     virtual void HandleMoved( double timestampsec );
     virtual void HandleResizing( double timestampsec, wxRect* rect );

-    
+

     virtual bool Destroy();
 
 protected:
     virtual bool Destroy();
 
 protected:


@@ -118,7 +124,7 @@ protected:
     virtual bool OSXShowWithEffect(bool show,
                                    wxShowEffect effect,
                                    unsigned timeout);
     virtual bool OSXShowWithEffect(bool show,
                                    wxShowEffect effect,
                                    unsigned timeout);

-    
+

     virtual void WillBeDestroyed();
 
     wxNonOwnedWindowImpl* m_nowpeer ;
     virtual void WillBeDestroyed();
 
     wxNonOwnedWindowImpl* m_nowpeer ;


@@ -126,7 +132,9 @@ protected:
 //    wxWindowMac* m_macFocus ;
 
     static wxNonOwnedWindow *s_macDeactivateWindow;
 //    wxWindowMac* m_macFocus ;
 
     static wxNonOwnedWindow *s_macDeactivateWindow;

+

 private :
 private :

+    wxRegion m_shape;

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