X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cd0d451b082ad2e3adc3691116eff24528d7a646..60372b0d54379701d62edf5595a7dc25c48330e1:/src/osx/toplevel_osx.cpp diff --git a/src/osx/toplevel_osx.cpp b/src/osx/toplevel_osx.cpp index 91ac80da69..4f3d1a6d3a 100644 --- a/src/osx/toplevel_osx.cpp +++ b/src/osx/toplevel_osx.cpp @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: src/osx/toplevel.cpp +// Name: src/osx/toplevel_osx.cpp // Purpose: implements wxTopLevelWindow for Mac // Author: Stefan Csomor // Modified by: // Created: 24.09.01 // RCS-ID: $Id$ // Copyright: (c) 2001-2004 Stefan Csomor -// License: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -73,10 +73,7 @@ bool wxTopLevelWindowMac::Create(wxWindow *parent, long style, const wxString& name) { - int w = WidthDefault(size.x); - int h = HeightDefault(size.y); - - if ( !wxNonOwnedWindow::Create(parent, id, pos, wxSize(w,h), style, name) ) + if ( !wxNonOwnedWindow::Create(parent, id, pos, size, style, name) ) return false; wxWindow::SetLabel( title ) ; @@ -86,6 +83,17 @@ bool wxTopLevelWindowMac::Create(wxWindow *parent, return true; } +bool wxTopLevelWindowMac::Create(wxWindow *parent, + WXWindow nativeWindow) +{ + if ( !wxNonOwnedWindow::Create(parent, nativeWindow ) ) + return false; + + wxTopLevelWindows.Append(this); + + return true; +} + wxTopLevelWindowMac::~wxTopLevelWindowMac() { } @@ -95,7 +103,7 @@ bool wxTopLevelWindowMac::Destroy() // NB: this will get called during destruction if we don't do it now, // and may fire a kill focus event on a control being destroyed #if wxOSX_USE_CARBON - if (m_nowpeer->GetWXWindow()) + if (m_nowpeer && m_nowpeer->GetWXWindow()) ClearKeyboardFocus( (WindowRef)m_nowpeer->GetWXWindow() ); #endif return wxTopLevelWindowBase::Destroy(); @@ -114,6 +122,9 @@ void wxTopLevelWindowMac::Maximize(bool maximize) bool wxTopLevelWindowMac::IsMaximized() const { + if ( m_nowpeer == NULL ) + return false; + return m_nowpeer->IsMaximized(); } @@ -125,6 +136,9 @@ void wxTopLevelWindowMac::Iconize(bool iconize) bool wxTopLevelWindowMac::IsIconized() const { + if ( m_nowpeer == NULL ) + return false; + return m_nowpeer->IsIconized(); } @@ -147,7 +161,8 @@ wxPoint wxTopLevelWindowMac::GetClientAreaOrigin() const void wxTopLevelWindowMac::SetTitle(const wxString& title) { - wxWindow::SetLabel( title ) ; + m_label = title ; + if ( m_nowpeer ) m_nowpeer->SetTitle(title, GetFont().GetEncoding() ); } @@ -157,6 +172,18 @@ wxString wxTopLevelWindowMac::GetTitle() const return wxWindow::GetLabel(); } +void wxTopLevelWindowMac::ShowWithoutActivating() +{ + // wxTopLevelWindowBase is derived from wxNonOwnedWindow, so don't + // call it here. + if ( !wxWindow::Show(true) ) + return; + + m_nowpeer->ShowWithoutActivating(); + + // TODO: Should we call EVT_SIZE here? +} + bool wxTopLevelWindowMac::ShowFullScreen(bool show, long style) { return m_nowpeer->ShowFullScreen(show, style); @@ -171,3 +198,18 @@ void wxTopLevelWindowMac::RequestUserAttention(int flags) { return m_nowpeer->RequestUserAttention(flags); } + +bool wxTopLevelWindowMac::IsActive() +{ + return m_nowpeer->IsActive(); +} + +void wxTopLevelWindowMac::OSXSetModified(bool modified) +{ + m_nowpeer->SetModified(modified); +} + +bool wxTopLevelWindowMac::OSXIsModified() const +{ + return m_nowpeer->IsModified(); +}