Add MSVS autoexp.dat fragment for some common wxWidgets types.

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

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index b5254d12d9c7e4809cebe6d74f23f3d93d9cb6ef..a164fdea4707f8b088751b388a539b15e537fc91 100644 (file)
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -1065,6 +1065,7 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
         if ( doResize )
         {
             MacRepositionScrollBars() ;
         if ( doResize )
         {
             MacRepositionScrollBars() ;

+            MacOnInternalSize();

             wxSize size(actualWidth, actualHeight);
             wxSizeEvent event(size, m_windowId);
             event.SetEventObject(this);
             wxSize size(actualWidth, actualHeight);
             wxSizeEvent event(size, m_windowId);
             event.SetEventObject(this);


@@ -1148,6 +1149,7 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 
         if (sizeFlags & wxSIZE_FORCE_EVENT)
         {
 
         if (sizeFlags & wxSIZE_FORCE_EVENT)
         {

+            MacOnInternalSize();

             wxSizeEvent event( wxSize(width,height), GetId() );
             event.SetEventObject( this );
             HandleWindowEvent( event );
             wxSizeEvent event( wxSize(width,height), GetId() );
             event.SetEventObject( this );
             HandleWindowEvent( event );


@@ -1252,12 +1254,18 @@ wxString wxWindowMac::GetLabel() const
 
 bool wxWindowMac::Show(bool show)
 {
 
 bool wxWindowMac::Show(bool show)
 {

+    if ( !show )
+        MacInvalidateBorders();
+    

     if ( !wxWindowBase::Show(show) )
         return false;
 
     if ( GetPeer() )
         GetPeer()->SetVisibility( show ) ;
 
     if ( !wxWindowBase::Show(show) )
         return false;
 
     if ( GetPeer() )
         GetPeer()->SetVisibility( show ) ;
 

+    if ( show )
+        MacInvalidateBorders();
+

 #ifdef __WXOSX_IPHONE__
     // only when there's no native event support
     if ( !IsTopLevel() )
 #ifdef __WXOSX_IPHONE__
     // only when there's no native event support
     if ( !IsTopLevel() )


@@ -1598,15 +1606,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 ) ;


@@ -1684,6 +1688,7 @@ void wxWindowMac::DoUpdateScrollbarVisibility()
     MacRepositionScrollBars() ;
     if ( triggerSizeEvent )
     {
     MacRepositionScrollBars() ;
     if ( triggerSizeEvent )
     {

+        MacOnInternalSize();

         wxSizeEvent event(GetSize(), m_windowId);
         event.SetEventObject(this);
         HandleWindowEvent(event);
         wxSizeEvent event(GetSize(), m_windowId);
         event.SetEventObject(this);
         HandleWindowEvent(event);


@@ -2103,6 +2108,11 @@ bool wxWindowMac::MacDoRedraw( long time )
     }
 
     m_updateRegion = formerUpdateRgn;
     }
 
     m_updateRegion = formerUpdateRgn;

+
+    wxNonOwnedWindow* top = MacGetTopLevelWindow();
+    if (top)
+        top->WindowWasPainted() ;
+    

     return handled;
 }
 
     return handled;
 }
 


@@ -2521,7 +2531,7 @@ Rect wxMacGetBoundsForControl( wxWindowMac* window , const wxPoint& pos , const
     int x, y, w, h ;
 
     window->MacGetBoundsForControl( pos , size , x , y, w, h , adjustForOrigin ) ;
     int x, y, w, h ;
 
     window->MacGetBoundsForControl( pos , size , x , y, w, h , adjustForOrigin ) ;

-    Rect bounds = { y, x, y + h, x + w };
+    Rect bounds = { static_cast<short>(y), static_cast<short>(x), static_cast<short>(y + h), static_cast<short>(x + w) };

 
     return bounds ;
 }
 
     return bounds ;
 }


@@ -2604,15 +2614,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 +2654,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 +2713,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 ( int i = ((int)s_hotkeys.size())-1; i>=0; -- i )

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