Tidy up the include guards for the various wxWebView header files.

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

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


@@ -56,9 +56,12 @@ public:
                 const wxString& name = wxPanelNameStr);
 
     bool Create(wxWindow *parent, WXWindow nativeWindow);
                 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


@@ -106,9 +109,9 @@ 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();
     virtual bool Destroy();

-    
+

 protected:
     // common part of all ctors
     void Init();
 protected:
     // common part of all ctors
     void Init();


@@ -121,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 ;


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

-    
+

 private :
     wxRegion m_shape;
 };
 private :
     wxRegion m_shape;
 };