X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c3ead1d1513a5eb79091a604f4e42b45d1bdf5d..0738b901b17340f09766524b8d9d79e9ed1268e7:/src/ribbon/buttonbar.cpp diff --git a/src/ribbon/buttonbar.cpp b/src/ribbon/buttonbar.cpp index b70f563f40..3de8011a5c 100644 --- a/src/ribbon/buttonbar.cpp +++ b/src/ribbon/buttonbar.cpp @@ -124,7 +124,7 @@ public: }; WX_DECLARE_OBJARRAY(wxRibbonButtonBarButtonInstance, wxArrayRibbonButtonBarButtonInstance); -#include +#include "wx/arrimpl.cpp" WX_DEFINE_OBJARRAY(wxArrayRibbonButtonBarButtonInstance); class wxRibbonButtonBarLayout @@ -333,7 +333,7 @@ wxRibbonButtonBarButtonBase* wxRibbonButtonBar::AddButton( base->client_data = client_data; base->state = 0; - wxMemoryDC temp_dc; + wxClientDC temp_dc(this); FetchButtonSizeInfo(base, wxRIBBON_BUTTONBAR_BUTTON_SMALL, temp_dc); FetchButtonSizeInfo(base, wxRIBBON_BUTTONBAR_BUTTON_MEDIUM, temp_dc); FetchButtonSizeInfo(base, wxRIBBON_BUTTONBAR_BUTTON_LARGE, temp_dc); @@ -454,7 +454,7 @@ void wxRibbonButtonBar::SetArtProvider(wxRibbonArtProvider* art) wxRibbonControl::SetArtProvider(art); - wxMemoryDC temp_dc; + wxClientDC temp_dc(this); size_t btn_count = m_buttons.Count(); size_t btn_i; for(btn_i = 0; btn_i < btn_count; ++btn_i)