amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-12 05:36:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix layout problems with blinking tabBar icons in wx2.6/vc7.1

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1633 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2011-01-21 22:01:39 +00:00
parent df32d0e99b
commit 213817ab34
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/set/window.cpp
+19 -2
View File
@@ -139,7 +139,7 @@ SetWindow::SetWindow(Window* parent, const SetP& set)
tb->Realize(); tb->Realize();
// tab bar, sizer // tab bar, sizer
wxToolBar* tabBar = new wxToolBar(this, ID_TAB_BAR, wxDefaultPosition, wxDefaultSize, wxTB_FLAT | wxNO_BORDER | wxTB_HORIZONTAL | wxTB_HORZ_TEXT); wxToolBar* tabBar = new wxToolBar(this, ID_TAB_BAR, wxDefaultPosition, wxDefaultSize, wxTB_FLAT | wxNO_BORDER | wxTB_HORIZONTAL | wxTB_HORZ_TEXT | wxTB_NOALIGN);
wxSizer* s = new wxBoxSizer(wxVERTICAL); wxSizer* s = new wxBoxSizer(wxVERTICAL);
s->Add(tabBar, 0, wxEXPAND | wxBOTTOM, 3); s->Add(tabBar, 0, wxEXPAND | wxBOTTOM, 3);
SetSizer(s); SetSizer(s);
@@ -256,11 +256,28 @@ void SetWindow::selectPanel(int id) {
current_panel->SetFocus(); current_panel->SetFocus();
} }
void toolbar_SetToolNormalBitmap(wxToolBar* toolbar, int id, wxBitmap const& bitmap) {
#if wxVERSION_NUMBER < 2800
// copied from wx2.8.11, tbar95.cpp
wxToolBarToolBase* tool = wx_static_cast(wxToolBarToolBase*, toolbar->FindById(id));
if (tool) {
tool->SetNormalBitmap(bitmap);
toolbar->Realize();
}
#else
toolbar->SetToolNormalBitmap(id, bitmap);
#endif
}
void SetWindow::setPanelIcon(SetWindowPanel* panel, wxBitmap const& icon) { void SetWindow::setPanelIcon(SetWindowPanel* panel, wxBitmap const& icon) {
for (size_t i = 0 ; i < panels.size() ; ++i) { for (size_t i = 0 ; i < panels.size() ; ++i) {
if (panels[i] == panel) { if (panels[i] == panel) {
wxToolBar* tabBar = (wxToolBar*)FindWindow(ID_TAB_BAR); wxToolBar* tabBar = (wxToolBar*)FindWindow(ID_TAB_BAR);
tabBar->SetToolNormalBitmap(ID_WINDOW_MIN+i, icon); toolbar_SetToolNormalBitmap(tabBar, ID_WINDOW_MIN+(int)i, icon);
#if wxVERSION_NUMBER < 2800
// This is needed at least in wx2.6, other versions seem not to need it, but maybe they do
Layout();
#endif
// TODO: this could be done better, wx requires a full new Realize of the toolbar, but on win32 a single message would do // TODO: this could be done better, wx requires a full new Realize of the toolbar, but on win32 a single message would do
// if only we could set up the imagelist correctly. // if only we could set up the imagelist correctly.
return; return;