Switching to a keyed list for storing information about the column data in each row...

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index e6a954fa299aaa4b68d9fc6489c0827a03469884..f4e4f26dbd84d90318dcf222a8e67b32830519d9 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -1095,7 +1095,7 @@ void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size)
     m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics) ) ;
 
     if (!m_macIsUserPane)
     m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics) ) ;
 
     if (!m_macIsUserPane)

-        SetInitialBestSize(size);
+        SetInitialSize(size);

 
     SetCursor( *wxSTANDARD_CURSOR ) ;
 }
 
     SetCursor( *wxSTANDARD_CURSOR ) ;
 }


@@ -1661,10 +1661,10 @@ void wxWindowMac::DoGetClientSize( int *x, int *y ) const
 
 bool wxWindowMac::SetCursor(const wxCursor& cursor)
 {
 
 bool wxWindowMac::SetCursor(const wxCursor& cursor)
 {

-    if (m_cursor == cursor)
+    if (m_cursor.IsSameAs(cursor))

         return false;
 
         return false;
 

-    if (wxNullCursor == cursor)
+    if (!cursor.IsOk())

     {
         if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )
             return false ;
     {
         if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )
             return false ;


@@ -2301,6 +2301,11 @@ void wxWindowMac::Thaw()
 #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


@@ -2687,7 +2692,7 @@ void wxWindowMac::OnSetFocus( wxFocusEvent& event )
         Rect rect ;
 
         m_peer->GetRect( &rect ) ;
         Rect rect ;
 
         m_peer->GetRect( &rect ) ;

-        // auf den umgebenden Rahmen zur\9fck
+        // auf den umgebenden Rahmen zurÂ\9fck

         InsetRect( &rect, -1 , -1 ) ;
 
         wxTopLevelWindowMac* top = MacGetTopLevelWindow();
         InsetRect( &rect, -1 , -1 ) ;
 
         wxTopLevelWindowMac* top = MacGetTopLevelWindow();