Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use <bitmapsize> to load bitmaps at the specified size in wxToolBar's XRC handler

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2009-05-05 18:23:04 +00:00
parent 5f3dc0f0a9
commit d0f063020e
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/xrc/xh_toolb.h
View File

@@ -29,6 +29,7 @@ public:
private: private:
bool m_isInside; bool m_isInside;
wxToolBar *m_toolbar; wxToolBar *m_toolbar;
wxSize m_toolSize;
}; };
#endif // wxUSE_XRC && wxUSE_TOOLBAR #endif // wxUSE_XRC && wxUSE_TOOLBAR

28
src/xrc/xh_toolb.cpp
View File

@@ -123,17 +123,17 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
} }
} }
wxToolBarToolBase * const wxToolBarToolBase * const tool =
tool = m_toolbar->AddTool m_toolbar->AddTool
( (
GetID(), GetID(),
GetText(wxT("label")), GetText(wxT("label")),
GetBitmap(wxT("bitmap"), wxART_TOOLBAR), GetBitmap(wxT("bitmap"), wxART_TOOLBAR, m_toolSize),
GetBitmap(wxT("bitmap2"), wxART_TOOLBAR), GetBitmap(wxT("bitmap2"), wxART_TOOLBAR, m_toolSize),
kind, kind,
GetText(wxT("tooltip")), GetText(wxT("tooltip")),
GetText(wxT("longhelp")) GetText(wxT("longhelp"))
); );
if ( GetBool(wxT("disabled")) ) if ( GetBool(wxT("disabled")) )
m_toolbar->EnableTool(GetID(), false); m_toolbar->EnableTool(GetID(), false);
@@ -172,9 +172,9 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
GetName()); GetName());
SetupWindow(toolbar); SetupWindow(toolbar);
wxSize bmpsize = GetSize(wxT("bitmapsize")); m_toolSize = GetSize(wxT("bitmapsize"));
if (!(bmpsize == wxDefaultSize)) if (!(m_toolSize == wxDefaultSize))
toolbar->SetToolBitmapSize(bmpsize); toolbar->SetToolBitmapSize(m_toolSize);
wxSize margins = GetSize(wxT("margins")); wxSize margins = GetSize(wxT("margins"));
if (!(margins == wxDefaultSize)) if (!(margins == wxDefaultSize))
toolbar->SetMargins(margins.x, margins.y); toolbar->SetMargins(margins.x, margins.y);