added wxArray::SetCount()

[wxWidgets.git] / src / mac / toplevel.cpp

diff --git a/src/mac/toplevel.cpp b/src/mac/toplevel.cpp
index e074c7fb31d6ad8be3e6464ec1776e31102db14a..b9acd02cc0d5b52ea3e93eb79e9332a6b7b780f7 100644 (file)
--- a/src/mac/toplevel.cpp
+++ b/src/mac/toplevel.cpp
@@ -59,10 +59,6 @@ wxWindowList       wxModelessWindows;
 static   Point     gs_lastWhere;
 static   long      gs_lastWhen = 0;
 
 static   Point     gs_lastWhere;
 static   long      gs_lastWhen = 0;
 

-// cursor stuff
-extern   int       wxBusyCursorCount;
-
-

 // ============================================================================
 // wxTopLevelWindowMac implementation
 // ============================================================================
 // ============================================================================
 // wxTopLevelWindowMac implementation
 // ============================================================================


@@ -79,7 +75,7 @@ wxTopLevelWindowMac *wxFindWinFromMacWindow(WXWindow inWindowRef)
     wxNode *node = wxWinMacWindowList->Find((long)inWindowRef);
     if (!node)
         return NULL;
     wxNode *node = wxWinMacWindowList->Find((long)inWindowRef);
     if (!node)
         return NULL;

-    return (wxTopLevelWindowMac *)node->Data();
+    return (wxTopLevelWindowMac *)node->GetData();

 }
 
 void wxAssociateWinWithMacWindow(WXWindow inWindowRef, wxTopLevelWindowMac *win)
 }
 
 void wxAssociateWinWithMacWindow(WXWindow inWindowRef, wxTopLevelWindowMac *win)


@@ -535,7 +531,7 @@ void wxTopLevelWindowMac::MacFireMouseEvent( WXEVENTREF evr )
         if ( ev->what == mouseUp )
         {
             wxTheApp->s_captureWindow = NULL ;
         if ( ev->what == mouseUp )
         {
             wxTheApp->s_captureWindow = NULL ;

-            if ( wxBusyCursorCount == 0 )
+            if ( !wxIsBusy() )

             {
                 m_cursor.MacInstall() ;
             }
             {
                 m_cursor.MacInstall() ;
             }


@@ -585,7 +581,13 @@ void wxTopLevelWindowMac::MacActivate( WXEVENTREF ev , bool inIsActivating )
     
     UMAHighlightAndActivateWindow( (WindowRef)m_macWindow , inIsActivating ) ;
     
     
     UMAHighlightAndActivateWindow( (WindowRef)m_macWindow , inIsActivating ) ;
     

-    MacSuperEnabled( inIsActivating ) ;
+    // Early versions of MacOS X don't refresh backgrounds properly,
+    // so refresh the whole window on activation and deactivation.
+    long osVersion = UMAGetSystemVersion();
+    if (osVersion >= 0x1000 && osVersion < 0x1020)
+        Refresh(TRUE);
+    else
+        MacSuperEnabled( inIsActivating ) ;

 }
 
 void wxTopLevelWindowMac::MacKeyDown( WXEVENTREF ev ) 
 }
 
 void wxTopLevelWindowMac::MacKeyDown( WXEVENTREF ev )