Correct format specifiers used to show wxIPV4address.

[wxWidgets.git] / src / osx / nonownedwnd_osx.cpp

diff --git a/src/osx/nonownedwnd_osx.cpp b/src/osx/nonownedwnd_osx.cpp
index 2a6f1cf0057a0404f444138f12e405ec4a14d3e0..638af1d7ac52c1e5f5717eb744fa92061297452e 100644 (file)
--- a/src/osx/nonownedwnd_osx.cpp
+++ b/src/osx/nonownedwnd_osx.cpp
@@ -13,6 +13,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/log.h"

 #endif // WX_PRECOMP
 
 #include "wx/hashmap.h"
 #endif // WX_PRECOMP
 
 #include "wx/hashmap.h"


@@ -44,36 +45,30 @@ wxWindow* g_MacLastWindow = NULL ;
 // wxWindowMac utility functions
 // ---------------------------------------------------------------------------
 
 // wxWindowMac utility functions
 // ---------------------------------------------------------------------------
 

-// Find an item given the Macintosh Window Reference
-
-WX_DECLARE_HASH_MAP(WXWindow, wxNonOwnedWindow*, wxPointerHash, wxPointerEqual, MacWindowMap);
+WX_DECLARE_HASH_MAP(WXWindow, wxNonOwnedWindowImpl*, wxPointerHash, wxPointerEqual, MacWindowMap);

 
 static MacWindowMap wxWinMacWindowList;
 
 
 static MacWindowMap wxWinMacWindowList;
 

-wxNonOwnedWindow *wxFindWindowFromWXWindow(WXWindow inWindowRef)
+wxNonOwnedWindow* wxNonOwnedWindow::GetFromWXWindow( WXWindow win )

 {
 {

-    MacWindowMap::iterator node = wxWinMacWindowList.find(inWindowRef);
-
-    return (node == wxWinMacWindowList.end()) ? NULL : node->second;
+    wxNonOwnedWindowImpl* impl = wxNonOwnedWindowImpl::FindFromWXWindow(win);
+    
+    return ( impl != NULL ? impl->GetWXPeer() : NULL ) ;

 }
 
 }
 

-void wxAssociateWindowWithWXWindow(WXWindow inWindowRef, wxNonOwnedWindow *win) ;
-void wxAssociateWindowWithWXWindow(WXWindow inWindowRef, wxNonOwnedWindow *win)
+wxNonOwnedWindowImpl* wxNonOwnedWindowImpl::FindFromWXWindow (WXWindow window)

 {
 {

-    // adding NULL WindowRef is (first) surely a result of an error and
-    // nothing else :-)
-    wxCHECK_RET( inWindowRef != (WXWindow) NULL, wxT("attempt to add a NULL WindowRef to window list") );
-
-    wxWinMacWindowList[inWindowRef] = win;
+    MacWindowMap::iterator node = wxWinMacWindowList.find(window);
+    
+    return (node == wxWinMacWindowList.end()) ? NULL : node->second;

 }
 
 }
 

-void wxRemoveWXWindowAssociation(wxNonOwnedWindow *win) ;
-void wxRemoveWXWindowAssociation(wxNonOwnedWindow *win)
+void wxNonOwnedWindowImpl::RemoveAssociations( wxNonOwnedWindowImpl* impl)

 {
     MacWindowMap::iterator it;
     for ( it = wxWinMacWindowList.begin(); it != wxWinMacWindowList.end(); ++it )
     {
 {
     MacWindowMap::iterator it;
     for ( it = wxWinMacWindowList.begin(); it != wxWinMacWindowList.end(); ++it )
     {

-        if ( it->second == win )
+        if ( it->second == impl )

         {
             wxWinMacWindowList.erase(it);
             break;
         {
             wxWinMacWindowList.erase(it);
             break;


@@ -81,9 +76,13 @@ void wxRemoveWXWindowAssociation(wxNonOwnedWindow *win)
     }
 }
 
     }
 }
 

-wxNonOwnedWindow* wxNonOwnedWindow::GetFromWXWindow( WXWindow win )
+void wxNonOwnedWindowImpl::Associate( WXWindow window, wxNonOwnedWindowImpl *impl )

 {
 {

-    return wxFindWindowFromWXWindow( win );
+    // adding NULL WindowRef is (first) surely a result of an error and
+    // nothing else :-)
+    wxCHECK_RET( window != (WXWindow) NULL, wxT("attempt to add a NULL WindowRef to window list") );
+    
+    wxWinMacWindowList[window] = impl;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -97,6 +96,7 @@ wxNonOwnedWindow *wxNonOwnedWindow::s_macDeactivateWindow = NULL;
 void wxNonOwnedWindow::Init()
 {
     m_nowpeer = NULL;
 void wxNonOwnedWindow::Init()
 {
     m_nowpeer = NULL;

+    m_isNativeWindowWrapper = false;

 }
 
 bool wxNonOwnedWindow::Create(wxWindow *parent,
 }
 
 bool wxNonOwnedWindow::Create(wxWindow *parent,


@@ -106,9 +106,6 @@ bool wxNonOwnedWindow::Create(wxWindow *parent,
                                  long style,
                                  const wxString& name)
 {
                                  long style,
                                  const wxString& name)
 {

-    // init our fields
-    Init();
-

     m_windowStyle = style;
 
     SetName( name );
     m_windowStyle = style;
 
     SetName( name );


@@ -133,7 +130,7 @@ bool wxNonOwnedWindow::Create(wxWindow *parent,
     int h = HeightDefault(size.y);
 
     m_nowpeer = wxNonOwnedWindowImpl::CreateNonOwnedWindow(this, parent, wxPoint(x,y) , wxSize(w,h) , style , GetExtraStyle(), name );
     int h = HeightDefault(size.y);
 
     m_nowpeer = wxNonOwnedWindowImpl::CreateNonOwnedWindow(this, parent, wxPoint(x,y) , wxSize(w,h) , style , GetExtraStyle(), name );

-    wxAssociateWindowWithWXWindow( m_nowpeer->GetWXWindow() , this ) ;
+    wxNonOwnedWindowImpl::Associate( m_nowpeer->GetWXWindow() , m_nowpeer ) ;

     m_peer = wxWidgetImpl::CreateContentView(this);
 
     DoSetWindowVariant( m_windowVariant ) ;
     m_peer = wxWidgetImpl::CreateContentView(this);
 
     DoSetWindowVariant( m_windowVariant ) ;


@@ -149,47 +146,77 @@ bool wxNonOwnedWindow::Create(wxWindow *parent,
     return true;
 }
 
     return true;
 }
 

+bool wxNonOwnedWindow::Create(wxWindow *parent, WXWindow nativeWindow)
+{
+    m_nowpeer = wxNonOwnedWindowImpl::CreateNonOwnedWindow(this, parent, nativeWindow );
+    m_isNativeWindowWrapper = true;
+    wxNonOwnedWindowImpl::Associate( m_nowpeer->GetWXWindow() , m_nowpeer ) ;
+    m_peer = wxWidgetImpl::CreateContentView(this);
+
+    if ( parent )
+        parent->AddChild(this);
+    
+    return true;
+}
+

 wxNonOwnedWindow::~wxNonOwnedWindow()
 {
     SendDestroyEvent();
 wxNonOwnedWindow::~wxNonOwnedWindow()
 {
     SendDestroyEvent();

-    
-    wxRemoveWXWindowAssociation( this ) ;
-    
+
+    wxNonOwnedWindowImpl::RemoveAssociations(m_nowpeer) ;
+

     DestroyChildren();
     DestroyChildren();

-    
-    delete m_nowpeer;
+
+    wxDELETE(m_nowpeer);

 
     // avoid dangling refs
     if ( s_macDeactivateWindow == this )
         s_macDeactivateWindow = NULL;
 }
 
 
     // avoid dangling refs
     if ( s_macDeactivateWindow == this )
         s_macDeactivateWindow = NULL;
 }
 

+bool wxNonOwnedWindow::Destroy()
+{
+    WillBeDestroyed();
+    
+    return wxWindow::Destroy();
+}
+
+void wxNonOwnedWindow::WillBeDestroyed()
+{
+    if ( m_nowpeer )
+        m_nowpeer->WillBeDestroyed();
+}
+

 // ----------------------------------------------------------------------------
 // wxNonOwnedWindow misc
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxNonOwnedWindow misc
 // ----------------------------------------------------------------------------
 

-bool wxNonOwnedWindow::ShowWithEffect(wxShowEffect effect,
-                                unsigned timeout )
-{ 
-    if ( !wxWindow::Show(true) )
+bool wxNonOwnedWindow::OSXShowWithEffect(bool show,
+                                         wxShowEffect effect,
+                                         unsigned timeout)
+{
+    // Cocoa code needs to manage window visibility on its own and so calls
+    // wxWindow::Show() as needed but if we already changed the internal
+    // visibility flag here, Show() would do nothing, so avoid doing it
+#if wxOSX_USE_CARBON
+    if ( !wxWindow::Show(show) )

         return false;
         return false;

+#endif // Carbon

 
 

-    // because apps expect a size event to occur at this moment
-    wxSizeEvent event(GetSize() , m_windowId);
-    event.SetEventObject(this);
-    HandleWindowEvent(event);
-
+    if ( effect == wxSHOW_EFFECT_NONE ||
+            !m_nowpeer || !m_nowpeer->ShowWithEffect(show, effect, timeout) )
+        return Show(show);

 
 

-    return m_nowpeer->ShowWithEffect(true, effect, timeout); 
-}
-
-bool wxNonOwnedWindow::HideWithEffect(wxShowEffect effect,
-                                unsigned timeout )
-{ 
-    if ( !wxWindow::Show(false) )
-        return false;
+    if ( show )
+    {
+        // as apps expect a size event to occur when the window is shown,
+        // generate one when it is shown with effect too
+        wxSizeEvent event(GetSize(), m_windowId);
+        event.SetEventObject(this);
+        HandleWindowEvent(event);
+    }

 
 

-    return m_nowpeer->ShowWithEffect(false, effect, timeout); 
+    return true;

 }
 
 wxPoint wxNonOwnedWindow::GetClientAreaOrigin() const
 }
 
 wxPoint wxNonOwnedWindow::GetClientAreaOrigin() const


@@ -200,17 +227,28 @@ wxPoint wxNonOwnedWindow::GetClientAreaOrigin() const
 }
 
 bool wxNonOwnedWindow::SetBackgroundColour(const wxColour& c )
 }
 
 bool wxNonOwnedWindow::SetBackgroundColour(const wxColour& c )

-{        
+{

     if ( !wxWindow::SetBackgroundColour(c) && m_hasBgCol )
         return false ;
     if ( !wxWindow::SetBackgroundColour(c) && m_hasBgCol )
         return false ;

-    
+

     if ( GetBackgroundStyle() != wxBG_STYLE_CUSTOM )
     {
         if ( m_nowpeer )
             return m_nowpeer->SetBackgroundColour(c);
     }
     return true;
     if ( GetBackgroundStyle() != wxBG_STYLE_CUSTOM )
     {
         if ( m_nowpeer )
             return m_nowpeer->SetBackgroundColour(c);
     }
     return true;

-}    
+}
+
+void wxNonOwnedWindow::SetWindowStyleFlag(long flags)
+{
+    if (flags == GetWindowStyleFlag())
+        return;
+        
+    wxWindow::SetWindowStyleFlag(flags);
+    
+    if (m_nowpeer)
+        m_nowpeer->SetWindowStyleFlag(flags);
+}

 
 // Raise the window to the top of the Z order
 void wxNonOwnedWindow::Raise()
 
 // Raise the window to the top of the Z order
 void wxNonOwnedWindow::Raise()


@@ -244,7 +282,7 @@ void wxNonOwnedWindow::HandleResized( double timestampsec )
     wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
 }
 
     wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
 }
 

-void wxNonOwnedWindow::HandleResizing( double timestampsec, wxRect* rect )
+void wxNonOwnedWindow::HandleResizing( double WXUNUSED(timestampsec), wxRect* rect )

 {
     wxRect r = *rect ;
 
 {
     wxRect r = *rect ;
 


@@ -305,7 +343,7 @@ bool wxNonOwnedWindow::Show(bool show)
 
     if ( m_nowpeer )
         m_nowpeer->Show(show);
 
     if ( m_nowpeer )
         m_nowpeer->Show(show);

-    
+

     if ( show )
     {
         // because apps expect a size event to occur at this moment
     if ( show )
     {
         // because apps expect a size event to occur at this moment


@@ -313,7 +351,7 @@ bool wxNonOwnedWindow::Show(bool show)
         event.SetEventObject(this);
         HandleWindowEvent(event);
     }
         event.SetEventObject(this);
         HandleWindowEvent(event);
     }

-    
+

     return true ;
 }
 
     return true ;
 }
 


@@ -344,8 +382,8 @@ bool wxNonOwnedWindow::SetBackgroundStyle(wxBackgroundStyle style)
 {
     if ( !wxWindow::SetBackgroundStyle(style) )
         return false ;
 {
     if ( !wxWindow::SetBackgroundStyle(style) )
         return false ;

-        
-    return m_nowpeer->SetBackgroundStyle(style);
+
+    return m_nowpeer ? m_nowpeer->SetBackgroundStyle(style) : true;

 }
 
 void wxNonOwnedWindow::DoMoveWindow(int x, int y, int width, int height)
 }
 
 void wxNonOwnedWindow::DoMoveWindow(int x, int y, int width, int height)


@@ -377,9 +415,9 @@ void wxNonOwnedWindow::DoGetSize( int *width, int *height ) const
 {
     if ( m_nowpeer == NULL )
         return;
 {
     if ( m_nowpeer == NULL )
         return;

-        
+

     int w,h;
     int w,h;

-    
+

     m_nowpeer->GetSize(w, h);
 
     if (width)
     m_nowpeer->GetSize(w, h);
 
     if (width)


@@ -395,7 +433,7 @@ void wxNonOwnedWindow::DoGetClientSize( int *width, int *height ) const
 
     int left, top, w, h;
     m_nowpeer->GetContentArea(left, top, w, h);
 
     int left, top, w, h;
     m_nowpeer->GetContentArea(left, top, w, h);

-
+    

     if (width)
        *width = w ;
     if (height)
     if (width)
        *width = w ;
     if (height)


@@ -418,11 +456,13 @@ WXWindow wxNonOwnedWindow::GetWXWindow() const
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 
 

-bool wxNonOwnedWindow::SetShape(const wxRegion& region)
+bool wxNonOwnedWindow::DoSetShape(const wxRegion& region)

 {
     wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,
 {
     wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,

-                 _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
+                 wxT("Shaped windows must be created with the wxFRAME_SHAPED style."));

 
 

+    m_shape = region;
+    

     // The empty region signifies that the shape
     // should be removed from the window.
     if ( region.IsEmpty() )
     // The empty region signifies that the shape
     // should be removed from the window.
     if ( region.IsEmpty() )


@@ -432,7 +472,7 @@ bool wxNonOwnedWindow::SetShape(const wxRegion& region)
         if ( rgn.IsEmpty() )
             return false ;
         else
         if ( rgn.IsEmpty() )
             return false ;
         else

-            return SetShape(rgn);
+            return DoSetShape(rgn);

     }
 
     return m_nowpeer->SetShape(region);
     }
 
     return m_nowpeer->SetShape(region);