#ifndef WX_PRECOMP
#include "wx/app.h"
+ #include "wx/dcmemory.h"
#include "wx/log.h"
#endif // WX_PRECOMP
wxWindow* g_MacLastWindow = NULL ;
+clock_t wxNonOwnedWindow::s_lastFlush = 0;
+
// unified title and toolbar constant - not in Tiger headers, so we duplicate it here
#define kWindowUnifiedTitleAndToolbarAttribute (1 << 7)
wxNonOwnedWindow* wxNonOwnedWindow::GetFromWXWindow( WXWindow win )
{
wxNonOwnedWindowImpl* impl = wxNonOwnedWindowImpl::FindFromWXWindow(win);
-
+
return ( impl != NULL ? impl->GetWXPeer() : NULL ) ;
}
wxNonOwnedWindowImpl* wxNonOwnedWindowImpl::FindFromWXWindow (WXWindow window)
{
MacWindowMap::iterator node = wxWinMacWindowList.find(window);
-
+
return (node == wxWinMacWindowList.end()) ? NULL : node->second;
}
// 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;
}
m_isShown = false;
// use the appropriate defaults for the position and size if necessary
- wxPoint pos(posOrig);
- if ( !pos.IsFullySpecified() )
- pos.SetDefaults(wxGetClientDisplayRect().GetPosition());
-
wxSize size(sizeOrig);
if ( !size.IsFullySpecified() )
size.SetDefaults(wxTopLevelWindow::GetDefaultSize());
+ wxPoint pos(posOrig);
+ if ( !pos.IsFullySpecified() )
+ {
+ wxRect rectWin = wxRect(size).CentreIn(wxGetClientDisplayRect());
+
+ // The size of the window is often not really known yet, TLWs are often
+ // created with some small initial size and later are fitted to contain
+ // their children so centering the window will show it too much to the
+ // right and bottom, adjust for it by putting it more to the left and
+ // center.
+ rectWin.x /= 2;
+ rectWin.y /= 2;
+
+ pos.SetDefaults(rectWin.GetPosition());
+ }
+
// create frame.
m_nowpeer = wxNonOwnedWindowImpl::CreateNonOwnedWindow
(
name
);
wxNonOwnedWindowImpl::Associate( m_nowpeer->GetWXWindow() , m_nowpeer ) ;
- m_peer = wxWidgetImpl::CreateContentView(this);
+ SetPeer(wxWidgetImpl::CreateContentView(this));
DoSetWindowVariant( m_windowVariant ) ;
{
if ( parent )
parent->AddChild(this);
-
+
SubclassWin(nativeWindow);
-
+
return true;
}
m_nowpeer = wxNonOwnedWindowImpl::CreateNonOwnedWindow(this, GetParent(), nativeWindow );
m_isNativeWindowWrapper = true;
wxNonOwnedWindowImpl::Associate( m_nowpeer->GetWXWindow() , m_nowpeer ) ;
- m_peer = wxWidgetImpl::CreateContentView(this);
+ SetPeer(wxWidgetImpl::CreateContentView(this));
}
void wxNonOwnedWindow::UnsubclassWin()
if ( GetParent() )
GetParent()->RemoveChild(this);
-
- wxNonOwnedWindowImpl::RemoveAssociations(m_nowpeer) ;
+
+ wxNonOwnedWindowImpl::RemoveAssociations(m_nowpeer) ;
wxDELETE(m_nowpeer);
- wxDELETE(m_peer);
+ SetPeer(NULL);
m_isNativeWindowWrapper = false;
}
bool wxNonOwnedWindow::Destroy()
{
WillBeDestroyed();
-
+
return wxWindow::Destroy();
}
{
// as apps expect a size event to occur when the window is shown,
// generate one when it is shown with effect too
+ MacOnInternalSize();
wxSizeEvent event(GetSize(), m_windowId);
event.SetEventObject(this);
HandleWindowEvent(event);
{
if (flags == GetWindowStyleFlag())
return;
-
+
wxWindow::SetWindowStyleFlag(flags);
-
+
if (m_nowpeer)
m_nowpeer->SetWindowStyleFlag(flags);
}
void wxNonOwnedWindow::HandleResized( double timestampsec )
{
+ MacOnInternalSize();
wxSizeEvent wxevent( GetSize() , GetId());
wxevent.SetTimestamp( (int) (timestampsec * 1000) );
wxevent.SetEventObject( this );
if ( show )
{
// because apps expect a size event to occur at this moment
+ MacOnInternalSize();
wxSizeEvent event(GetSize() , m_windowId);
event.SetEventObject(this);
HandleWindowEvent(event);
return;
int left, top, w, h;
+ // under iphone with a translucent status bar the m_nowpeer returns the
+ // inner area, while the content area extends under the translucent
+ // status bar, therefore we use the content view's area
+#ifdef __WXOSX_IPHONE__
+ GetPeer()->GetContentArea(left, top, w, h);
+#else
m_nowpeer->GetContentArea(left, top, w, h);
+#endif
if (width)
*width = w ;
*height = h ;
}
+void wxNonOwnedWindow::WindowWasPainted()
+{
+ s_lastFlush = clock();
+}
void wxNonOwnedWindow::Update()
{
- m_nowpeer->Update();
+ if ( clock() - s_lastFlush > CLOCKS_PER_SEC / 30 )
+ {
+ s_lastFlush = clock();
+ m_nowpeer->Update();
+ }
}
WXWindow wxNonOwnedWindow::GetWXWindow() const
// Shape implementation
// ---------------------------------------------------------------------------
-
-bool wxNonOwnedWindow::DoSetShape(const wxRegion& region)
+bool wxNonOwnedWindow::DoClearShape()
{
- wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,
- wxT("Shaped windows must be created with the wxFRAME_SHAPED style."));
+ m_shape.Clear();
+
+ wxSize sz = GetClientSize();
+ wxRegion region(0, 0, sz.x, sz.y);
+ return m_nowpeer->SetShape(region);
+}
+
+bool wxNonOwnedWindow::DoSetRegionShape(const wxRegion& region)
+{
m_shape = region;
-
- // The empty region signifies that the shape
- // should be removed from the window.
- if ( region.IsEmpty() )
+
+ return m_nowpeer->SetShape(region);
+}
+
+#if wxUSE_GRAPHICS_CONTEXT
+
+#include "wx/scopedptr.h"
+
+bool wxNonOwnedWindow::DoSetPathShape(const wxGraphicsPath& path)
+{
+ m_shapePath = path;
+
+ // Convert the path to wxRegion by rendering the path on a window-sized
+ // bitmap, creating a mask from it and finally creating the region from
+ // this mask.
+ wxBitmap bmp(GetSize());
+
{
- wxSize sz = GetClientSize();
- wxRegion rgn(0, 0, sz.x, sz.y);
- if ( rgn.IsEmpty() )
- return false ;
- else
- return DoSetShape(rgn);
+ wxMemoryDC dc(bmp);
+ dc.SetBackground(*wxBLACK);
+ dc.Clear();
+
+ wxScopedPtr<wxGraphicsContext> context(wxGraphicsContext::Create(dc));
+ context->SetBrush(*wxWHITE);
+ context->FillPath(m_shapePath);
}
- return m_nowpeer->SetShape(region);
+ bmp.SetMask(new wxMask(bmp, *wxBLACK));
+
+ return DoSetRegionShape(wxRegion(bmp));
}
+
+#endif // wxUSE_GRAPHICS_CONTEXT
projects / wxWidgets.git / blobdiff