Commited region iterator fix.

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

diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp
index f26a5bbaf1e28307fb2fbc632283545ac8337b9c..9456f5515f4426796b046b4d261bb1c106c6cf9c 100644 (file)
--- a/src/aui/dockart.cpp
+++ b/src/aui/dockart.cpp
@@ -36,6 +36,7 @@
 
 #ifdef __WXMAC__
 #include "wx/mac/private.h"
 
 #ifdef __WXMAC__
 #include "wx/mac/private.h"

+#include "wx/graphics.h"

 #endif
 
 #ifdef __WXGTK__
 #endif
 
 #ifdef __WXGTK__


@@ -312,7 +313,7 @@ void wxDefaultDockArt::DrawSash(wxDC& dc, wxWindow *window, int orientation, con
     HIRect splitterRect = CGRectMake( rect.x , rect.y , rect.width , rect.height );
     CGContextRef cgContext ;
 #if wxMAC_USE_CORE_GRAPHICS
     HIRect splitterRect = CGRectMake( rect.x , rect.y , rect.width , rect.height );
     CGContextRef cgContext ;
 #if wxMAC_USE_CORE_GRAPHICS

-    cgContext = ((wxMacCGContext*)(dc.GetGraphicContext()))->GetNativeContext() ;
+    cgContext = (CGContextRef) dc.GetGraphicsContext()->GetNativeContext() ;

 #else
     Rect bounds ;
     GetPortBounds( (CGrafPtr) dc.m_macPort , &bounds ) ;
 #else
     Rect bounds ;
     GetPortBounds( (CGrafPtr) dc.m_macPort , &bounds ) ;


@@ -588,13 +589,13 @@ void wxDefaultDockArt::DrawPaneButton(wxDC& dc, wxWindow *WXUNUSED(window),
     switch (button)
     {
         default:
     switch (button)
     {
         default:

-        case wxPaneInfo::buttonClose:
+        case wxAUI_BUTTON_CLOSE:

             if (pane.state & wxPaneInfo::optionActive)
                 bmp = m_active_close_bitmap;
                  else
                 bmp = m_inactive_close_bitmap;
             break;
             if (pane.state & wxPaneInfo::optionActive)
                 bmp = m_active_close_bitmap;
                  else
                 bmp = m_inactive_close_bitmap;
             break;

-        case wxPaneInfo::buttonPin:
+        case wxAUI_BUTTON_PIN:

             if (pane.state & wxPaneInfo::optionActive)
                 bmp = m_active_pin_bitmap;
                  else
             if (pane.state & wxPaneInfo::optionActive)
                 bmp = m_active_pin_bitmap;
                  else