Digital Mars compilation warnings and Unicode fixes (patch 884587)

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

diff --git a/src/mac/window.cpp b/src/mac/window.cpp
index fbe96110d233a5c7f12fa0d02ff159c15d3fecdc..5e485ecf641c4e3db229a47ace13cfa7052f9478 100644 (file)
--- a/src/mac/window.cpp
+++ b/src/mac/window.cpp
@@ -100,10 +100,6 @@ END_EVENT_TABLE()
 
 void wxWindowMac::Init()
 {
 
 void wxWindowMac::Init()
 {

-    // generic
-    InitBase();
-
-    m_isBeingDeleted = FALSE;

     m_backgroundTransparent = FALSE;
 
     // as all windows are created with WS_VISIBLE style...
     m_backgroundTransparent = FALSE;
 
     // as all windows are created with WS_VISIBLE style...


@@ -116,8 +112,6 @@ void wxWindowMac::Init()
 
     m_hScrollBar = NULL ;
     m_vScrollBar = NULL ;
 
     m_hScrollBar = NULL ;
     m_vScrollBar = NULL ;

-
-    m_label = wxEmptyString;

 }
 
 // Destructor
 }
 
 // Destructor


@@ -224,6 +218,10 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
         MacCreateScrollBars( style ) ;
     }
 #endif
         MacCreateScrollBars( style ) ;
     }
 #endif

+
+    wxWindowCreateEvent event(this);
+    GetEventHandler()->AddPendingEvent(event);
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -640,12 +638,40 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
                 oldRgn = NewRgn() ;
                 newRgn = NewRgn() ;
                 diffRgn = NewRgn() ;
                 oldRgn = NewRgn() ;
                 newRgn = NewRgn() ;
                 diffRgn = NewRgn() ;

+                
+                // invalidate the differences between the old and the new area
+                

                 SetRectRgn(oldRgn , oldPos.x , oldPos.y , oldPos.x + m_width , oldPos.y + m_height ) ;
                 SetRectRgn(newRgn , newPos.x , newPos.y , newPos.x + actualWidth , newPos.y + actualHeight ) ;
                 DiffRgn( newRgn , oldRgn , diffRgn ) ;
                 InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ;
                 DiffRgn( oldRgn , newRgn , diffRgn ) ;
                 InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ;
                 SetRectRgn(oldRgn , oldPos.x , oldPos.y , oldPos.x + m_width , oldPos.y + m_height ) ;
                 SetRectRgn(newRgn , newPos.x , newPos.y , newPos.x + actualWidth , newPos.y + actualHeight ) ;
                 DiffRgn( newRgn , oldRgn , diffRgn ) ;
                 InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ;
                 DiffRgn( oldRgn , newRgn , diffRgn ) ;
                 InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ;

+                
+                // we also must invalidate the border areas, someone might optimize this one day to invalidate only the really
+                // changing pixels...
+                
+                if ( MacGetLeftBorderSize() != 0 || MacGetRightBorderSize() != 0 || 
+                       MacGetTopBorderSize() != 0 || MacGetBottomBorderSize() != 0 )
+                {
+                       RgnHandle innerOldRgn, innerNewRgn ;
+                       innerOldRgn = NewRgn() ;
+                       innerNewRgn = NewRgn() ;
+                       
+                       SetRectRgn(innerOldRgn , oldPos.x + MacGetLeftBorderSize()  , oldPos.y + MacGetTopBorderSize() , 
+                               oldPos.x + m_width - MacGetRightBorderSize() , oldPos.y + m_height - MacGetBottomBorderSize() ) ;
+                   DiffRgn( oldRgn , innerOldRgn , diffRgn ) ;
+                       InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ;
+
+                       SetRectRgn(innerNewRgn , newPos.x + MacGetLeftBorderSize()  , newPos.y + MacGetTopBorderSize() , 
+                               newPos.x + actualWidth - MacGetRightBorderSize() , newPos.y + actualHeight - MacGetBottomBorderSize() ) ;
+                   DiffRgn( newRgn , innerNewRgn , diffRgn ) ;
+                       InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ;
+                       
+                       DisposeRgn( innerOldRgn ) ;
+                       DisposeRgn( innerNewRgn ) ;
+                }
+                

                 DisposeRgn(oldRgn) ;
                 DisposeRgn(newRgn) ;
                 DisposeRgn(diffRgn) ;
                 DisposeRgn(oldRgn) ;
                 DisposeRgn(newRgn) ;
                 DisposeRgn(diffRgn) ;


@@ -1069,23 +1095,38 @@ void wxWindowMac::MacPaintBorders( int left , int top )
 {
     if( IsTopLevel() )
         return ;
 {
     if( IsTopLevel() )
         return ;

+        
+    int major,minor;
+    wxGetOsVersion( &major, &minor );

 
     RGBColor white = { 0xFFFF, 0xFFFF , 0xFFFF } ;
 
     RGBColor white = { 0xFFFF, 0xFFFF , 0xFFFF } ;

-    RGBColor black = { 0x0000, 0x0000 , 0x0000 } ;

     RGBColor face = { 0xDDDD, 0xDDDD , 0xDDDD } ;
     RGBColor face = { 0xDDDD, 0xDDDD , 0xDDDD } ;

-    RGBColor shadow = { 0x4444, 0x4444 , 0x4444 } ;
+    
+    RGBColor darkShadow = { 0x0000, 0x0000 , 0x0000 } ;
+    RGBColor lightShadow = { 0x4444, 0x4444 , 0x4444 } ;
+    // OS X has lighter border edges than classic:
+    if (major >= 10) 
+    {
+        darkShadow.red                 = 0x8E8E;
+        darkShadow.green       = 0x8E8E;
+        darkShadow.blue        = 0x8E8E;
+        lightShadow.red        = 0xBDBD;
+        lightShadow.green      = 0xBDBD;
+        lightShadow.blue       = 0xBDBD;
+       }
+    

     PenNormal() ;
 
     if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
     {
 #if wxMAC_USE_THEME_BORDER
     PenNormal() ;
 
     if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
     {
 #if wxMAC_USE_THEME_BORDER

-          Rect rect = { top , left , m_height + top , m_width + left } ;
-          SInt32 border = 0 ;
-          /*
-          GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
-          InsetRect( &rect , border , border );
-      DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
-      */
+        Rect rect = { top , left , m_height + top , m_width + left } ;
+        SInt32 border = 0 ;
+        /*
+        GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
+        InsetRect( &rect , border , border );
+        DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
+        */

 
         DrawThemePrimaryGroup(&rect  ,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
 #else
 
         DrawThemePrimaryGroup(&rect  ,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
 #else


@@ -1099,22 +1140,22 @@ void wxWindowMac::MacPaintBorders( int left , int top )
         LineTo( left + m_width - 3 , top + m_height - 3 );
         LineTo( left + m_width - 3 , top + 2 );
 
         LineTo( left + m_width - 3 , top + m_height - 3 );
         LineTo( left + m_width - 3 , top + 2 );
 

-        RGBForeColor( sunken ? &face : &black );
+        RGBForeColor( sunken ? &face : &darkShadow );

         MoveTo( left + 0 , top + m_height - 1 );
         LineTo( left + m_width - 1 , top + m_height - 1 );
         LineTo( left + m_width - 1 , top + 0 );
 
         MoveTo( left + 0 , top + m_height - 1 );
         LineTo( left + m_width - 1 , top + m_height - 1 );
         LineTo( left + m_width - 1 , top + 0 );
 

-        RGBForeColor( sunken ? &shadow : &white );
+        RGBForeColor( sunken ? &lightShadow : &white );

         MoveTo( left + 1 , top + m_height - 3 );
         LineTo( left + 1, top + 1 );
         LineTo( left + m_width - 3 , top + 1 );
 
         MoveTo( left + 1 , top + m_height - 3 );
         LineTo( left + 1, top + 1 );
         LineTo( left + m_width - 3 , top + 1 );
 

-        RGBForeColor( sunken ? &white : &shadow );
+        RGBForeColor( sunken ? &white : &lightShadow );

         MoveTo( left + 1 , top + m_height - 2 );
         LineTo( left + m_width - 2 , top + m_height - 2 );
         LineTo( left + m_width - 2 , top + 1 );
 
         MoveTo( left + 1 , top + m_height - 2 );
         LineTo( left + m_width - 2 , top + m_height - 2 );
         LineTo( left + m_width - 2 , top + 1 );
 

-        RGBForeColor( sunken ? &black : &face );
+        RGBForeColor( sunken ? &darkShadow : &face );

         MoveTo( left + 2 , top + m_height - 4 );
         LineTo( left + 2 , top + 2 );
         LineTo( left + m_width - 4 , top + 2 );
         MoveTo( left + 2 , top + m_height - 4 );
         LineTo( left + 2 , top + 2 );
         LineTo( left + m_width - 4 , top + 2 );


@@ -1122,8 +1163,8 @@ void wxWindowMac::MacPaintBorders( int left , int top )
     }
     else if (HasFlag(wxSIMPLE_BORDER))
     {
     }
     else if (HasFlag(wxSIMPLE_BORDER))
     {

-            Rect rect = { top , left , m_height + top , m_width + left } ;
-        RGBForeColor( &black ) ;
+        Rect rect = { top , left , m_height + top , m_width + left } ;
+        RGBForeColor( &darkShadow ) ;

         FrameRect( &rect ) ;
     }
 }
         FrameRect( &rect ) ;
     }
 }


@@ -1454,7 +1495,7 @@ bool wxWindowMac::MacSetupCursor( const wxPoint& pt)
 }
 
 bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
 }
 
 bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)

-{
+{    

     if ((event.m_x < m_x) || (event.m_y < m_y) ||
         (event.m_x > (m_x + m_width)) || (event.m_y > (m_y + m_height)))
         return FALSE;
     if ((event.m_x < m_x) || (event.m_y < m_y) ||
         (event.m_x > (m_x + m_width)) || (event.m_y > (m_y + m_height)))
         return FALSE;