Fix wxOSX/Carbon compilation after wxListCtrlBase introduction.

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

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index b5254d12d9c7e4809cebe6d74f23f3d93d9cb6ef..012deb900dec323d56548b82c1100bb1d4ac076b 100644 (file)
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -1598,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 ) ;


@@ -2604,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 ;


@@ -2641,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 )
         {


@@ -2700,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 )
         {