Initial implementation of wxWebProtocolHandler and wxWebFileProtocolHandler for the...

[wxWidgets.git] / src / ribbon / art_aui.cpp

diff --git a/src/ribbon/art_aui.cpp b/src/ribbon/art_aui.cpp
index 6a5df2529db1907407329c74519a68c4516030b9..99ae7001be165cd77ba07d560b45c022b5cde4c7 100644 (file)
--- a/src/ribbon/art_aui.cpp
+++ b/src/ribbon/art_aui.cpp
@@ -15,12 +15,9 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/dc.h"
-#include "wx/settings.h"
-#include "wx/ribbon/art.h"
-

 #if wxUSE_RIBBON
 
 #if wxUSE_RIBBON
 

+#include "wx/ribbon/art.h"

 #include "wx/ribbon/art_internal.h"
 #include "wx/ribbon/bar.h"
 #include "wx/ribbon/buttonbar.h"
 #include "wx/ribbon/art_internal.h"
 #include "wx/ribbon/bar.h"
 #include "wx/ribbon/buttonbar.h"


@@ -28,14 +25,14 @@
 #include "wx/ribbon/toolbar.h"
 
 #ifndef WX_PRECOMP
 #include "wx/ribbon/toolbar.h"
 
 #ifndef WX_PRECOMP

+#include "wx/dc.h"
+#include "wx/settings.h"

 #endif
 
 #ifdef __WXMSW__
 #include "wx/msw/private.h"
 #elif defined(__WXMAC__)
 #include "wx/osx/private.h"
 #endif
 
 #ifdef __WXMSW__
 #include "wx/msw/private.h"
 #elif defined(__WXMAC__)
 #include "wx/osx/private.h"

-// only for kThemeBrushToolbarBackground
-#include <Carbon/Carbon.h>

 #endif
 
 wxRibbonAUIArtProvider::wxRibbonAUIArtProvider()
 #endif
 
 wxRibbonAUIArtProvider::wxRibbonAUIArtProvider()


@@ -390,9 +387,12 @@ void wxRibbonAUIArtProvider::DrawTab(wxDC& dc,
         icon = tab.page->GetIcon();
         if((m_flags & wxRIBBON_BAR_SHOW_PAGE_LABELS) == 0)
         {
         icon = tab.page->GetIcon();
         if((m_flags & wxRIBBON_BAR_SHOW_PAGE_LABELS) == 0)
         {

+            if(icon.IsOk())
+            {

             int x = tab.rect.x + (tab.rect.width - icon.GetWidth()) / 2;
             dc.DrawBitmap(icon, x, tab.rect.y + 1 + (tab.rect.height - 1 -
                 icon.GetHeight()) / 2, true);
             int x = tab.rect.x + (tab.rect.width - icon.GetWidth()) / 2;
             dc.DrawBitmap(icon, x, tab.rect.y + 1 + (tab.rect.height - 1 -
                 icon.GetHeight()) / 2, true);

+            }

         }
     }
     if(m_flags & wxRIBBON_BAR_SHOW_PAGE_LABELS)
         }
     }
     if(m_flags & wxRIBBON_BAR_SHOW_PAGE_LABELS)


@@ -637,6 +637,8 @@ wxSize wxRibbonAUIArtProvider::GetPanelClientSize(
         if(client_offset)
             *client_offset = wxPoint(3, label_height + 2);
     }
         if(client_offset)
             *client_offset = wxPoint(3, label_height + 2);
     }

+    if (size.x < 0) size.x = 0;
+    if (size.y < 0) size.y = 0;

     return size;
 }
 
     return size;
 }
 


@@ -862,7 +864,7 @@ void wxRibbonAUIArtProvider::DrawGalleryBackground(
     dc.SetPen(m_gallery_border_pen);
     dc.SetBrush(*wxTRANSPARENT_BRUSH);
     dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
     dc.SetPen(m_gallery_border_pen);
     dc.SetBrush(*wxTRANSPARENT_BRUSH);
     dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);

-    
+

     DrawGalleryBackgroundCommon(dc, wnd, rect);
 }
 
     DrawGalleryBackgroundCommon(dc, wnd, rect);
 }
 


@@ -957,6 +959,13 @@ void wxRibbonAUIArtProvider::DrawButtonBarButton(
                         const wxBitmap& bitmap_large,
                         const wxBitmap& bitmap_small)
 {
                         const wxBitmap& bitmap_large,
                         const wxBitmap& bitmap_small)
 {

+    if(kind == wxRIBBON_BUTTON_TOGGLE)
+    {
+        kind = wxRIBBON_BUTTON_NORMAL;
+        if(state & wxRIBBON_BUTTONBAR_BUTTON_TOGGLED)
+            state ^= wxRIBBON_BUTTONBAR_BUTTON_ACTIVE_MASK;
+    }
+

     if(state & (wxRIBBON_BUTTONBAR_BUTTON_HOVER_MASK
         | wxRIBBON_BUTTONBAR_BUTTON_ACTIVE_MASK))
     {
     if(state & (wxRIBBON_BUTTONBAR_BUTTON_HOVER_MASK
         | wxRIBBON_BUTTONBAR_BUTTON_ACTIVE_MASK))
     {


@@ -1120,7 +1129,7 @@ void wxRibbonAUIArtProvider::DrawTool(
         avail_width -= 8;
         if(is_split_hybrid)
         {
         avail_width -= 8;
         if(is_split_hybrid)
         {

-            dc.DrawLine(rect.x + avail_width + 1, rect.y, 
+            dc.DrawLine(rect.x + avail_width + 1, rect.y,

                 rect.x + avail_width + 1, rect.y + rect.height);
         }
         dc.DrawBitmap(m_toolbar_drop_bitmap, bg_rect.x + avail_width + 2,
                 rect.x + avail_width + 1, rect.y + rect.height);
         }
         dc.DrawBitmap(m_toolbar_drop_bitmap, bg_rect.x + avail_width + 2,