Added wxRendererNative::DrawTitleBarBitmap().

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

diff --git a/include/wx/osx/nonownedwnd.h b/include/wx/osx/nonownedwnd.h
index 3ce7ae952c7a023cf79c88272c87c0bb98c105d8..6df0dbe286c7bc81a0633605c4e4a366eb495bdb 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
 // 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
 // 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
 #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
 
 //-----------------------------------------------------------------------------
 #endif
 
 //-----------------------------------------------------------------------------


@@ -61,13 +61,11 @@ public:
 
     // implement base class pure virtuals
 
 
     // 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 bool SetTransparent(wxByte alpha);
     virtual bool CanSetTransparent();
 
     virtual bool SetBackgroundStyle(wxBackgroundStyle style);

-    
+

     virtual void Update();
 
     WXWindow GetWXWindow() const ;
     virtual void Update();
 
     WXWindow GetWXWindow() const ;


@@ -76,6 +74,8 @@ public:
     // implementation from now on
     // --------------------------
 
     // 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 ) ;
     // activation hooks only necessary for MDI Implementation
     static void MacDelayedDeactivation(long timestamp);
     virtual void MacActivate( long timestamp , bool inIsActivating ) ;


@@ -94,16 +94,16 @@ public:
     virtual void SetExtraStyle(long exStyle) ;
 
     virtual bool SetBackgroundColour( const wxColour &colour );
     virtual void SetExtraStyle(long exStyle) ;
 
     virtual bool SetBackgroundColour( const wxColour &colour );

-    
+

     wxNonOwnedWindowImpl* GetNonOwnedPeer() const { return m_nowpeer; }
     wxNonOwnedWindowImpl* GetNonOwnedPeer() const { return m_nowpeer; }

-    
+

     // osx specific event handling common for all osx-ports
     // 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 void HandleActivated( double timestampsec, bool didActivate );
     virtual void HandleResized( double timestampsec );
     virtual void HandleMoved( double timestampsec );
     virtual void HandleResizing( double timestampsec, wxRect* rect );

-        
+

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