#pragma hdrstop
#endif
-#include "wx/ribbon/art.h"
-
#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/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
wxRibbonAUIArtProvider::wxRibbonAUIArtProvider()
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);
+ }
}
}
if(m_flags & wxRIBBON_BAR_SHOW_PAGE_LABELS)
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;
}
dc.SetPen(m_gallery_border_pen);
dc.SetBrush(*wxTRANSPARENT_BRUSH);
dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
-
+
DrawGalleryBackgroundCommon(dc, wnd, rect);
}
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,