moved win_gtk.h header to wx/gtk/private, it's for internal use only

[wxWidgets.git] / src / mac / carbon / window.cpp

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 565c2b38a71cae5a3a1317014e895d20669abe7a..e6ac15ee792d075f31babecfaefdcfbf1f8899c4 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -865,7 +865,6 @@ wxWindowMac::wxWindowMac(wxWindowMac *parent,
 void wxWindowMac::Init()
 {
     m_peer = NULL ;
 void wxWindowMac::Init()
 {
     m_peer = NULL ;

-    m_frozenness = 0 ;

     m_macAlpha = 255 ;
     m_cgContextRef = NULL ;
 
     m_macAlpha = 255 ;
     m_cgContextRef = NULL ;
 


@@ -2091,38 +2090,25 @@ void wxWindowMac::Refresh(bool WXUNUSED(eraseBack), const wxRect *rect)
     }
 }
 
     }
 }
 

-void wxWindowMac::Freeze()
+void wxWindowMac::DoFreeze()

 {
 #if TARGET_API_MAC_OSX
 {
 #if TARGET_API_MAC_OSX

-    if ( !m_frozenness++ )
-    {
-        if ( m_peer && m_peer->Ok() )
-            m_peer->SetDrawingEnabled( false ) ;
-    }
+    if ( m_peer && m_peer->Ok() )
+        m_peer->SetDrawingEnabled( false ) ;

 #endif
 }
 
 #endif
 }
 

-void wxWindowMac::Thaw()
+void wxWindowMac::DoThaw()

 {
 #if TARGET_API_MAC_OSX
 {
 #if TARGET_API_MAC_OSX

-    wxASSERT_MSG( m_frozenness > 0, wxT("Thaw() without matching Freeze()") );
-
-    if ( !--m_frozenness )
+    if ( m_peer && m_peer->Ok() )

     {
     {

-        if ( m_peer && m_peer->Ok() )
-        {
-            m_peer->SetDrawingEnabled( true ) ;
-            m_peer->InvalidateWithChildren() ;
-        }
+        m_peer->SetDrawingEnabled( true ) ;
+        m_peer->InvalidateWithChildren() ;

     }
 #endif
 }
 
     }
 #endif
 }
 

-bool wxWindowMac::IsFrozen() const
-{
-    return m_frozenness != 0;
-}
-

 wxWindowMac *wxGetActiveWindow()
 {
     // actually this is a windows-only concept
 wxWindowMac *wxGetActiveWindow()
 {
     // actually this is a windows-only concept


@@ -2516,7 +2502,7 @@ void wxWindowMac::OnInternalIdle()
 {
     // This calls the UI-update mechanism (querying windows for
     // menu/toolbar/control state information)
 {
     // This calls the UI-update mechanism (querying windows for
     // menu/toolbar/control state information)

-    if (wxUpdateUIEvent::CanUpdate(this) && IsShown())
+    if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen())

         UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 }
 
         UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 }