1. wxMotif fixes for compilation in "no compatible" mode
2. Common fixes to be able to link minimal sample without stream classes, tree ctrl, list ctrl &c git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -16,7 +16,7 @@
|
||||
#include "wx/wx.h"
|
||||
#include "wx/app.h"
|
||||
#include "wx/timer.h"
|
||||
#include "wx/motif/toolbar.h"
|
||||
#include "wx/toolbar.h"
|
||||
|
||||
#include <Xm/Xm.h>
|
||||
#include <Xm/PushBG.h>
|
||||
@@ -605,7 +605,8 @@ wxToolBarTool *wxToolBar::AddTool(int index, const wxBitmap& bitmap, const wxBit
|
||||
else
|
||||
tool->m_y = m_yMargin;
|
||||
|
||||
tool->SetSize(GetDefaultButtonWidth(), GetDefaultButtonHeight());
|
||||
wxSize& size = GetToolSize();
|
||||
tool->SetSize(size.x, size.y);
|
||||
|
||||
m_tools.Append((long)index, tool);
|
||||
return tool;
|
||||
|
Reference in New Issue
Block a user