don't compute (and mainly don't cache) our best size until we have created the radio...

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

diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp
index 1045f438e05ecbecaa7cb819461a13356bf82761..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 ) ;


@@ -372,6 +373,8 @@ void wxDefaultDockArt::DrawSash(wxDC& dc, wxWindow *window, int orientation, con
     );
 
 #else
     );
 
 #else

+    wxUnusedVar(window);
+    wxUnusedVar(orientation);

     dc.SetPen(*wxTRANSPARENT_PEN);
     dc.SetBrush(m_sash_brush);
     dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
     dc.SetPen(*wxTRANSPARENT_PEN);
     dc.SetBrush(m_sash_brush);
     dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);


@@ -379,7 +382,7 @@ void wxDefaultDockArt::DrawSash(wxDC& dc, wxWindow *window, int orientation, con
 }
 
 
 }
 
 

-void wxDefaultDockArt::DrawBackground(wxDC& dc, wxWindow *window, int, const wxRect& rect)
+void wxDefaultDockArt::DrawBackground(wxDC& dc, wxWindow *WXUNUSED(window), int, const wxRect& rect)

 {
     dc.SetPen(*wxTRANSPARENT_PEN);
 #ifdef __WXMAC__
 {
     dc.SetPen(*wxTRANSPARENT_PEN);
 #ifdef __WXMAC__


@@ -392,7 +395,7 @@ void wxDefaultDockArt::DrawBackground(wxDC& dc, wxWindow *window, int, const wxR
     dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
 }
 
     dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
 }
 

-void wxDefaultDockArt::DrawBorder(wxDC& dc, wxWindow *window, const wxRect& _rect,
+void wxDefaultDockArt::DrawBorder(wxDC& dc, wxWindow *WXUNUSED(window), const wxRect& _rect,

                                   wxPaneInfo& pane)
 {
     dc.SetPen(m_border_pen);
                                   wxPaneInfo& pane)
 {
     dc.SetPen(m_border_pen);


@@ -474,7 +477,7 @@ void wxDefaultDockArt::DrawCaptionBackground(wxDC& dc, const wxRect& rect, bool
 }
 
 
 }
 
 

-void wxDefaultDockArt::DrawCaption(wxDC& dc, wxWindow *window, 
+void wxDefaultDockArt::DrawCaption(wxDC& dc, wxWindow *WXUNUSED(window),

                                    const wxString& text,
                                    const wxRect& rect,
                                    wxPaneInfo& pane)
                                    const wxString& text,
                                    const wxRect& rect,
                                    wxPaneInfo& pane)


@@ -499,7 +502,7 @@ void wxDefaultDockArt::DrawCaption(wxDC& dc, wxWindow *window,
     dc.DestroyClippingRegion();
 }
 
     dc.DestroyClippingRegion();
 }
 

-void wxDefaultDockArt::DrawGripper(wxDC& dc, wxWindow *window, 
+void wxDefaultDockArt::DrawGripper(wxDC& dc, wxWindow *WXUNUSED(window),

                                    const wxRect& rect,
                                    wxPaneInfo& pane)
 {
                                    const wxRect& rect,
                                    wxPaneInfo& pane)
 {


@@ -550,7 +553,7 @@ void wxDefaultDockArt::DrawGripper(wxDC& dc, wxWindow *window,
     }
 }
 
     }
 }
 

-void wxDefaultDockArt::DrawPaneButton(wxDC& dc, wxWindow *window, 
+void wxDefaultDockArt::DrawPaneButton(wxDC& dc, wxWindow *WXUNUSED(window),

                                       int button,
                                       int button_state,
                                       const wxRect& _rect,
                                       int button,
                                       int button_state,
                                       const wxRect& _rect,


@@ -586,13 +589,13 @@ void wxDefaultDockArt::DrawPaneButton(wxDC& dc, wxWindow *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