updates from Adrián González Alba

[wxWidgets.git] / src / aui / dockart.cpp

diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp
index 68c5bb373b2b2a3c3fe12f670ad6af7b76a12477..563154c89e1d28e58ef37ec01f530f12361e58d8 100644 (file)
--- a/src/aui/dockart.cpp
+++ b/src/aui/dockart.cpp
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        dockart.cpp
+// Name:        src/aui/dockart.cpp

 // Purpose:     wxaui: wx advanced user interface - docking window manager
 // Author:      Benjamin I. Williams
 // Modified by:
 // Created:     2005-05-17
 // Purpose:     wxaui: wx advanced user interface - docking window manager
 // Author:      Benjamin I. Williams
 // Modified by:
 // Created:     2005-05-17

-// RCS-ID:      
+// RCS-ID:      $Id$

 // Copyright:   (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////


@@ -25,14 +25,17 @@
 
 #if wxUSE_AUI
 
 
 #if wxUSE_AUI
 

-#include "wx/image.h"
-#include "wx/dcclient.h"
-#include "wx/settings.h"

 #include "wx/aui/framemanager.h"
 #include "wx/aui/dockart.h"
 
 #ifndef WX_PRECOMP
 #include "wx/aui/framemanager.h"
 #include "wx/aui/dockart.h"
 
 #ifndef WX_PRECOMP

-//    #include "wx/log.h"
+    #include "wx/settings.h"
+    #include "wx/dcclient.h"
+    #include "wx/image.h"
+#endif
+
+#ifdef __WXMAC__
+#include "wx/mac/private.h"

 #endif
 
 // -- wxDefaultDockArt class implementation --
 #endif
 
 // -- wxDefaultDockArt class implementation --


@@ -50,9 +53,9 @@
 static wxColor StepColour(const wxColor& c, int percent)
 {
     int r = c.Red(), g = c.Green(), b = c.Blue();
 static wxColor StepColour(const wxColor& c, int percent)
 {
     int r = c.Red(), g = c.Green(), b = c.Blue();

-    return wxColour(wxMin((r*percent)/100,255),
-                    wxMin((g*percent)/100,255),
-                    wxMin((b*percent)/100,255));
+    return wxColour((unsigned char)wxMin((r*percent)/100,255),
+                    (unsigned char)wxMin((g*percent)/100,255),
+                    (unsigned char)wxMin((b*percent)/100,255));

 }
 
 static wxColor LightContrastColour(const wxColour& c)
 }
 
 static wxColor LightContrastColour(const wxColour& c)


@@ -102,7 +105,9 @@ static void DrawGradientRectangle(wxDC& dc,
         int g = start_color.Green() + ((i*gd*100)/high)/100;
         int b = start_color.Blue() + ((i*bd*100)/high)/100;
 
         int g = start_color.Green() + ((i*gd*100)/high)/100;
         int b = start_color.Blue() + ((i*bd*100)/high)/100;
 

-        wxPen p(wxColor(r,g,b));
+        wxPen p(wxColor((unsigned char)r,
+                        (unsigned char)g,
+                        (unsigned char)b));

         dc.SetPen(p);
 
         if (direction == wxAUI_GRADIENT_VERTICAL)
         dc.SetPen(p);
 
         if (direction == wxAUI_GRADIENT_VERTICAL)


@@ -122,7 +127,7 @@ wxDefaultDockArt::wxDefaultDockArt()
 #else
     wxColor base_color = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
 #endif
 #else
     wxColor base_color = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
 #endif

-    
+

     wxColor darker1_color = StepColour(base_color, 85);
     wxColor darker2_color = StepColour(base_color, 70);
     wxColor darker3_color = StepColour(base_color, 60);
     wxColor darker1_color = StepColour(base_color, 85);
     wxColor darker2_color = StepColour(base_color, 70);
     wxColor darker3_color = StepColour(base_color, 60);


@@ -173,7 +178,7 @@ wxDefaultDockArt::wxDefaultDockArt()
         0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0xfc,0xdf,0xfc,0xdf,0xfc,
         0xdf,0xfc,0xdf,0xfc,0xdf,0xfc,0x0f,0xf8,0x7f,0xff,0x7f,0xff,
         0x7f,0xff,0xff,0xff,0xff,0xff,0xff,0xff};
         0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0xfc,0xdf,0xfc,0xdf,0xfc,
         0xdf,0xfc,0xdf,0xfc,0xdf,0xfc,0x0f,0xf8,0x7f,0xff,0x7f,0xff,
         0x7f,0xff,0xff,0xff,0xff,0xff,0xff,0xff};

-          
+

 #ifdef __WXMAC__
     m_inactive_close_bitmap = BitmapFromBits(close_bits, 16, 16, *wxWHITE);
 #else
 #ifdef __WXMAC__
     m_inactive_close_bitmap = BitmapFromBits(close_bits, 16, 16, *wxWHITE);
 #else


@@ -236,16 +241,16 @@ wxColour wxDefaultDockArt::GetColour(int id)
 {
     switch (id)
     {
 {
     switch (id)
     {

-        case wxAUI_ART_BACKGROUND_COLOUR:                return m_background_brush.GetColour(); break;
-        case wxAUI_ART_SASH_COLOUR:                      return m_sash_brush.GetColour(); break;
-        case wxAUI_ART_INACTIVE_CAPTION_COLOUR:          return m_inactive_caption_colour; break;
-        case wxAUI_ART_INACTIVE_CAPTION_GRADIENT_COLOUR: return m_inactive_caption_gradient_colour; break;
-        case wxAUI_ART_INACTIVE_CAPTION_TEXT_COLOUR:     return m_inactive_caption_text_colour; break;
-        case wxAUI_ART_ACTIVE_CAPTION_COLOUR:            return m_active_caption_colour; break;
-        case wxAUI_ART_ACTIVE_CAPTION_GRADIENT_COLOUR:   return m_active_caption_gradient_colour; break;
-        case wxAUI_ART_ACTIVE_CAPTION_TEXT_COLOUR:       return m_active_caption_text_colour; break;
-        case wxAUI_ART_BORDER_COLOUR:                    return m_border_pen.GetColour(); break;
-        case wxAUI_ART_GRIPPER_COLOUR:                   return m_gripper_brush.GetColour(); break;
+        case wxAUI_ART_BACKGROUND_COLOUR:                return m_background_brush.GetColour();
+        case wxAUI_ART_SASH_COLOUR:                      return m_sash_brush.GetColour();
+        case wxAUI_ART_INACTIVE_CAPTION_COLOUR:          return m_inactive_caption_colour;
+        case wxAUI_ART_INACTIVE_CAPTION_GRADIENT_COLOUR: return m_inactive_caption_gradient_colour;
+        case wxAUI_ART_INACTIVE_CAPTION_TEXT_COLOUR:     return m_inactive_caption_text_colour;
+        case wxAUI_ART_ACTIVE_CAPTION_COLOUR:            return m_active_caption_colour;
+        case wxAUI_ART_ACTIVE_CAPTION_GRADIENT_COLOUR:   return m_active_caption_gradient_colour;
+        case wxAUI_ART_ACTIVE_CAPTION_TEXT_COLOUR:       return m_active_caption_text_colour;
+        case wxAUI_ART_BORDER_COLOUR:                    return m_border_pen.GetColour();
+        case wxAUI_ART_GRIPPER_COLOUR:                   return m_gripper_brush.GetColour();

         default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break;
     }
 
         default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break;
     }
 


@@ -301,13 +306,13 @@ void wxDefaultDockArt::DrawSash(wxDC& dc, int, const wxRect& rect)
     CGContextTranslateCTM( cgContext , 0 , bounds.bottom - bounds.top ) ;
     CGContextScaleCTM( cgContext , 1 , -1 ) ;
 #endif
     CGContextTranslateCTM( cgContext , 0 , bounds.bottom - bounds.top ) ;
     CGContextScaleCTM( cgContext , 1 , -1 ) ;
 #endif

-    
+

     HIThemeSplitterDrawInfo drawInfo ;
     drawInfo.version = 0 ;
     drawInfo.state = kThemeStateActive ;
     drawInfo.adornment = kHIThemeSplitterAdornmentNone ;
     HIThemeSplitterDrawInfo drawInfo ;
     drawInfo.version = 0 ;
     drawInfo.state = kThemeStateActive ;
     drawInfo.adornment = kHIThemeSplitterAdornmentNone ;

-    HIThemeDrawPaneSplitter( &splitterRect , &drawInfo , cgContext , kHIThemeOrientationNormal ) ;    
-    
+    HIThemeDrawPaneSplitter( &splitterRect , &drawInfo , cgContext , kHIThemeOrientationNormal ) ;
+

 #if wxMAC_USE_CORE_GRAPHICS
 #else
     QDEndCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ;
 #if wxMAC_USE_CORE_GRAPHICS
 #else
     QDEndCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ;


@@ -350,7 +355,7 @@ void wxDefaultDockArt::DrawBorder(wxDC& dc, const wxRect& _rect,
             dc.SetPen(*wxWHITE_PEN);
             dc.DrawLine(rect.x, rect.y, rect.x+rect.width, rect.y);
             dc.DrawLine(rect.x, rect.y, rect.x, rect.y+rect.height);
             dc.SetPen(*wxWHITE_PEN);
             dc.DrawLine(rect.x, rect.y, rect.x+rect.width, rect.y);
             dc.DrawLine(rect.x, rect.y, rect.x, rect.y+rect.height);

-            dc.SetPen(m_border_pen);       
+            dc.SetPen(m_border_pen);

             dc.DrawLine(rect.x, rect.y+rect.height-1,
                         rect.x+rect.width, rect.y+rect.height-1);
             dc.DrawLine(rect.x+rect.width-1, rect.y,
             dc.DrawLine(rect.x, rect.y+rect.height-1,
                         rect.x+rect.width, rect.y+rect.height-1);
             dc.DrawLine(rect.x+rect.width-1, rect.y,


@@ -358,7 +363,7 @@ void wxDefaultDockArt::DrawBorder(wxDC& dc, const wxRect& _rect,
             rect.Deflate(1);
         }
     }
             rect.Deflate(1);
         }
     }

-     else
+    else

     {
         for (i = 0; i < border_width; ++i)
         {
     {
         for (i = 0; i < border_width; ++i)
         {


@@ -380,7 +385,7 @@ void wxDefaultDockArt::DrawCaptionBackground(wxDC& dc, const wxRect& rect, bool
 
         dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
     }
 
         dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
     }

-     else
+    else

     {
         if (active)
         {
     {
         if (active)
         {


@@ -429,7 +434,7 @@ void wxDefaultDockArt::DrawCaption(wxDC& dc,
 
     if (pane.state & wxPaneInfo::optionActive)
         dc.SetTextForeground(m_active_caption_text_colour);
 
     if (pane.state & wxPaneInfo::optionActive)
         dc.SetTextForeground(m_active_caption_text_colour);

-     else
+    else

         dc.SetTextForeground(m_inactive_caption_text_colour);
 
 
         dc.SetTextForeground(m_inactive_caption_text_colour);