Implement wxBookCtrlBase::CalcSizeFromPage() in the base class.

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

diff --git a/include/wx/osx/nonownedwnd.h b/include/wx/osx/nonownedwnd.h
index 3ce7ae952c7a023cf79c88272c87c0bb98c105d8..eee92a7ea6006f5bcc8794e05b447f12cebb6821 100644 (file)
--- a/include/wx/osx/nonownedwnd.h
+++ b/include/wx/osx/nonownedwnd.h
@@ -2,7 +2,7 @@
 // Name:        wx/mac/nonownedwnd.h
 // Purpose:     declares wxNonOwnedWindow class
 // Author:      Stefan Csomor
-// Modified by: 
+// Modified by:
 // Created:     2008-03-24
 // RCS-ID:      $Id: nonownedwnd.h 46993 2007-06-28 08:46:04Z VS $
 // Copyright:   (c) 2008 Stefan Csomor
@@ -15,7 +15,7 @@
 #include "wx/window.h"
 
 #if wxUSE_SYSTEM_OPTIONS
-    #define wxMAC_WINDOW_PLAIN_TRANSITION _T("mac.window-plain-transition")
+    #define wxMAC_WINDOW_PLAIN_TRANSITION wxT("mac.window-plain-transition")
 #endif
 
 //-----------------------------------------------------------------------------
@@ -61,13 +61,11 @@ public:
 
     // implement base class pure virtuals
 
-    virtual bool SetShape(const wxRegion& region);
-
     virtual bool SetTransparent(wxByte alpha);
     virtual bool CanSetTransparent();
 
     virtual bool SetBackgroundStyle(wxBackgroundStyle style);
-    
+
     virtual void Update();
 
     WXWindow GetWXWindow() const ;
@@ -76,34 +74,38 @@ public:
     // implementation from now on
     // --------------------------
 
+    virtual bool DoSetShape(const wxRegion& region);
+
     // activation hooks only necessary for MDI Implementation
     static void MacDelayedDeactivation(long timestamp);
     virtual void MacActivate( long timestamp , bool inIsActivating ) ;
 
+    virtual void SetWindowStyleFlag(long flags);
 
     virtual void Raise();
     virtual void Lower();
     virtual bool Show( bool show = true );
 
-    virtual bool ShowWithEffect(wxShowEffect effect,
-                                unsigned timeout = 0) ;
-
-    virtual bool HideWithEffect(wxShowEffect effect,
-                                unsigned timeout = 0) ;
-
     virtual void SetExtraStyle(long exStyle) ;
 
     virtual bool SetBackgroundColour( const wxColour &colour );
-    
+
     wxNonOwnedWindowImpl* GetNonOwnedPeer() const { return m_nowpeer; }
-    
+
+#if wxOSX_USE_COCOA_OR_IPHONE
+    // override the base class method to return an NSWindow instead of NSView
+    virtual void *OSXGetViewOrWindow() const { return GetWXWindow(); }
+#endif // Cocoa
+
     // osx specific event handling common for all osx-ports
-    
+
     virtual void HandleActivated( double timestampsec, bool didActivate );
     virtual void HandleResized( double timestampsec );
     virtual void HandleMoved( double timestampsec );
     virtual void HandleResizing( double timestampsec, wxRect* rect );
-        
+    
+    virtual bool Destroy();
+
 protected:
     // common part of all ctors
     void Init();
@@ -113,6 +115,12 @@ protected:
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual void DoGetClientSize(int *width, int *height) const;
 
+    virtual bool OSXShowWithEffect(bool show,
+                                   wxShowEffect effect,
+                                   unsigned timeout);
+    
+    virtual void WillBeDestroyed();
+
     wxNonOwnedWindowImpl* m_nowpeer ;
 
 //    wxWindowMac* m_macFocus ;