Update version to 2.9.4 in version.bkl too and rebake everything.

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

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index 3adbc2c67e1a918c9feccc6f9b9b1ae1bd9967e9..012deb900dec323d56548b82c1100bb1d4ac076b 100644 (file)
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -58,15 +58,15 @@
 #endif
 
 #if wxUSE_DRAG_AND_DROP
 #endif
 
 #if wxUSE_DRAG_AND_DROP

-#include "wx/dnd.h"
+    #include "wx/dnd.h"

 #endif
 
 #include "wx/graphics.h"
 
 #if wxOSX_USE_CARBON
 #endif
 
 #include "wx/graphics.h"
 
 #if wxOSX_USE_CARBON

-#include "wx/osx/uma.h"
+    #include "wx/osx/uma.h"

 #else
 #else

-#include "wx/osx/private.h"
+    #include "wx/osx/private.h"

 #endif
 
 #define MAC_SCROLLBAR_SIZE 15
 #endif
 
 #define MAC_SCROLLBAR_SIZE 15


@@ -444,7 +444,8 @@ void wxWindowMac::MacChildAdded()
 #endif
 }
 
 #endif
 }
 

-void wxWindowMac::MacPostControlCreate(const wxPoint& WXUNUSED(pos), const wxSize& size)
+void wxWindowMac::MacPostControlCreate(const wxPoint& WXUNUSED(pos),
+                                       const wxSize& WXUNUSED(size))

 {
     // todo remove if refactoring works correctly
 #if 0
 {
     // todo remove if refactoring works correctly
 #if 0


@@ -475,7 +476,7 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
 {
     // Don't assert, in case we set the window variant before
     // the window is created
 {
     // Don't assert, in case we set the window variant before
     // the window is created

-    // wxASSERT( GetPeer()->Ok() ) ;
+    // wxASSERT( GetPeer()->IsOk() ) ;

 
     m_windowVariant = variant ;
 
 
     m_windowVariant = variant ;
 


@@ -588,7 +589,7 @@ bool wxWindowMac::SetBackgroundColour(const wxColour& col )
 {
     if (m_growBox)
     {
 {
     if (m_growBox)
     {

-        if ( m_backgroundColour.Ok() )
+        if ( m_backgroundColour.IsOk() )

             m_growBox->SetBackgroundColour(m_backgroundColour);
         else
             m_growBox->SetBackgroundColour(*wxWHITE);
             m_growBox->SetBackgroundColour(m_backgroundColour);
         else
             m_growBox->SetBackgroundColour(*wxWHITE);


@@ -897,7 +898,7 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor)
             return false ;
     }
 
             return false ;
     }
 

-    wxASSERT_MSG( m_cursor.Ok(),
+    wxASSERT_MSG( m_cursor.IsOk(),

         wxT("cursor must be valid after call to the base version"));
 
     if ( GetPeer() != NULL )
         wxT("cursor must be valid after call to the base version"));
 
     if ( GetPeer() != NULL )


@@ -1560,7 +1561,7 @@ void  wxWindowMac::MacPaintGrowBox()
         CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ;
         CGContextSaveGState( cgContext );
 
         CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ;
         CGContextSaveGState( cgContext );
 

-        if ( m_backgroundColour.Ok() )
+        if ( m_backgroundColour.IsOk() )

         {
             CGContextSetFillColorWithColor( cgContext, m_backgroundColour.GetCGColor() );
         }
         {
             CGContextSetFillColorWithColor( cgContext, m_backgroundColour.GetCGColor() );
         }


@@ -1573,7 +1574,7 @@ void  wxWindowMac::MacPaintGrowBox()
 #else
         if (m_growBox)
         {
 #else
         if (m_growBox)
         {

-             if ( m_backgroundColour.Ok() )
+             if ( m_backgroundColour.IsOk() )

                  m_growBox->SetBackgroundColour(m_backgroundColour);
              else
                  m_growBox->SetBackgroundColour(*wxWHITE);
                  m_growBox->SetBackgroundColour(m_backgroundColour);
              else
                  m_growBox->SetBackgroundColour(*wxWHITE);


@@ -1597,15 +1598,11 @@ void wxWindowMac::MacPaintBorders( int WXUNUSED(leftOrigin) , int WXUNUSED(right
     GetPeer()->GetSize( tw, th );
     GetPeer()->GetPosition( tx, ty );
 
     GetPeer()->GetSize( tw, th );
     GetPeer()->GetPosition( tx, ty );
 

-    Rect rect  = { ty,tx, ty+th, tx+tw };
-

 #if wxOSX_USE_COCOA_OR_CARBON
 
 #if wxOSX_USE_COCOA_OR_CARBON
 

-    InsetRect( &rect, -1 , -1 ) ;
-

     {
     {

-        CGRect cgrect = CGRectMake( rect.left , rect.top , rect.right - rect.left ,
-            rect.bottom - rect.top ) ;
+        CGRect cgrect = CGRectMake( tx-1 , ty-1 , tw+2 ,
+            th+2 ) ;

 
         CGContextRef cgContext = (CGContextRef) GetParent()->MacGetCGContextRef() ;
         wxASSERT( cgContext ) ;
 
         CGContextRef cgContext = (CGContextRef) GetParent()->MacGetCGContextRef() ;
         wxASSERT( cgContext ) ;


@@ -1831,18 +1828,18 @@ bool wxWindowMac::MacSetupCursor( const wxPoint& pt )
             // if the user code caught EVT_SET_CURSOR() and returned nothing from
             // it - this is a way to say that our cursor shouldn't be used for this
             // point
             // if the user code caught EVT_SET_CURSOR() and returned nothing from
             // it - this is a way to say that our cursor shouldn't be used for this
             // point

-            if ( !processedEvtSetCursor && m_cursor.Ok() )
+            if ( !processedEvtSetCursor && m_cursor.IsOk() )

                 cursor = m_cursor ;
 
             if ( !wxIsBusy() && !GetParent() )
                 cursor = *wxSTANDARD_CURSOR ;
         }
 
                 cursor = m_cursor ;
 
             if ( !wxIsBusy() && !GetParent() )
                 cursor = *wxSTANDARD_CURSOR ;
         }
 

-        if ( cursor.Ok() )
+        if ( cursor.IsOk() )

             cursor.MacInstall() ;
     }
 
             cursor.MacInstall() ;
     }
 

-    return cursor.Ok() ;
+    return cursor.IsOk() ;

 }
 
 wxString wxWindowMac::MacGetToolTipString( wxPoint &WXUNUSED(pt) )
 }
 
 wxString wxWindowMac::MacGetToolTipString( wxPoint &WXUNUSED(pt) )


@@ -2603,15 +2600,18 @@ bool wxWindowMac::IsShownOnScreen() const
 
 #if wxUSE_HOTKEY && wxOSX_USE_COCOA_OR_CARBON
 
 
 #if wxUSE_HOTKEY && wxOSX_USE_COCOA_OR_CARBON
 

-OSStatus wxHotKeyHandler(EventHandlerCallRef nextHandler,EventRef event, void *userData)
+OSStatus
+wxHotKeyHandler(EventHandlerCallRef WXUNUSED(nextHandler),
+                EventRef event,
+                void* WXUNUSED(userData))

 {
     EventHotKeyID hotKeyId;
 
     GetEventParameter( event, kEventParamDirectObject, typeEventHotKeyID, NULL, sizeof(hotKeyId), NULL, &hotKeyId);
 
 {
     EventHotKeyID hotKeyId;
 
     GetEventParameter( event, kEventParamDirectObject, typeEventHotKeyID, NULL, sizeof(hotKeyId), NULL, &hotKeyId);
 

-    for ( int i = 0; i < s_hotkeys.size(); ++i )
+    for ( unsigned i = 0; i < s_hotkeys.size(); ++i )

     {
     {

-        if ( s_hotkeys[i].keyId == hotKeyId.id )
+        if ( s_hotkeys[i].keyId == static_cast<int>(hotKeyId.id) )

         {
             unsigned char charCode ;
             UInt32 keyCode ;
         {
             unsigned char charCode ;
             UInt32 keyCode ;


@@ -2640,7 +2640,7 @@ OSStatus wxHotKeyHandler(EventHandlerCallRef nextHandler,EventRef event, void *u
 
 bool wxWindowMac::RegisterHotKey(int hotkeyId, int modifiers, int keycode)
 {
 
 bool wxWindowMac::RegisterHotKey(int hotkeyId, int modifiers, int keycode)
 {

-    for ( int i = 0; i < s_hotkeys.size(); ++i )
+    for ( unsigned i = 0; i < s_hotkeys.size(); ++i )

     {
         if ( s_hotkeys[i].keyId == hotkeyId )
         {
     {
         if ( s_hotkeys[i].keyId == hotkeyId )
         {


@@ -2666,9 +2666,9 @@ bool wxWindowMac::RegisterHotKey(int hotkeyId, int modifiers, int keycode)
         mac_modifiers |= optionKey;
     if ( modifiers & wxMOD_SHIFT )
         mac_modifiers |= shiftKey;
         mac_modifiers |= optionKey;
     if ( modifiers & wxMOD_SHIFT )
         mac_modifiers |= shiftKey;

-    if ( modifiers & wxMOD_CONTROL )
+    if ( modifiers & wxMOD_RAW_CONTROL )

         mac_modifiers |= controlKey;
         mac_modifiers |= controlKey;

-    if ( modifiers & wxMOD_META )
+    if ( modifiers & wxMOD_CONTROL )

         mac_modifiers |= cmdKey;
     
     EventHotKeyRef hotKeyRef;
         mac_modifiers |= cmdKey;
     
     EventHotKeyRef hotKeyRef;


@@ -2699,7 +2699,7 @@ bool wxWindowMac::RegisterHotKey(int hotkeyId, int modifiers, int keycode)
 
 bool wxWindowMac::UnregisterHotKey(int hotkeyId)
 {
 
 bool wxWindowMac::UnregisterHotKey(int hotkeyId)
 {

-    for ( int i = s_hotkeys.size()-1; i>=0; -- i )
+    for ( unsigned i = s_hotkeys.size()-1; i>=0; -- i )

     {
         if ( s_hotkeys[i].keyId == hotkeyId )
         {
     {
         if ( s_hotkeys[i].keyId == hotkeyId )
         {