Fixed VC6 compilation - wxAny(const wxVariant&) ctor required a specific 'template<>')

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

diff --git a/src/osx/toplevel_osx.cpp b/src/osx/toplevel_osx.cpp
index 8abcfbab435bc4773589a7513f9464cadd23c7b2..785a0e10c27c6937ef776d4fbd65a32d8f3aa9c2 100644 (file)
--- a/src/osx/toplevel_osx.cpp
+++ b/src/osx/toplevel_osx.cpp
@@ -95,7 +95,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
     // 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();
         ClearKeyboardFocus( (WindowRef)m_nowpeer->GetWXWindow() );
 #endif
     return wxTopLevelWindowBase::Destroy();


@@ -114,6 +114,9 @@ void wxTopLevelWindowMac::Maximize(bool maximize)
 
 bool wxTopLevelWindowMac::IsMaximized() const
 {
 
 bool wxTopLevelWindowMac::IsMaximized() const
 {

+    if ( m_nowpeer == NULL )
+        return false;
+    

     return m_nowpeer->IsMaximized();
 }
 
     return m_nowpeer->IsMaximized();
 }
 


@@ -125,6 +128,9 @@ void wxTopLevelWindowMac::Iconize(bool iconize)
 
 bool wxTopLevelWindowMac::IsIconized() const
 {
 
 bool wxTopLevelWindowMac::IsIconized() const
 {

+    if ( m_nowpeer == NULL )
+        return false;
+

     return m_nowpeer->IsIconized();
 }
 
     return m_nowpeer->IsIconized();
 }