Developer forums (C::B DEVELOPMENT STRICTLY!) > Development
toolbar bottom edge is not shown corectly under C::B build with wx git master
ollydbg:
I have build C::B trunk wx30 project(the wxScintilla 3.6.x branch) against wx git master. (Under Windows XP with MinGW-W64 GCC 5.3 compiler)
The wx git head is:
--- Code: ---Revision: 0a555f3c833ab94c9ee3f9250778b113894e14e0
Author: Artur Wieczorek <artwik@wp.pl>
Date: 2016-2-13 3:06:47
Message:
Fix ToolsVersion value in minimal sample project file (VS 2010+).
Since minimal.vcxproj file is shared by VS 2010-15 solution files, ToolsVersion value should be set to the value supported by all VS versions since 2010 to avoid warning messages like "Project file contains ToolsVersion="14.0", which is not supported by this version of MSBuild.".
----
Modified: samples/minimal/minimal.vcxproj
--- End code ---
But I see the toolbar does not shown correctly, the bottom edge is not drawn, see image shot below.
Did you see this issue in your environment?
ollydbg:
It looks like the toolbar height is a big larger then the correct one(such as 16.01 release).
The former one has 5 vertical dots in the left edge of the toolbar, but the later has only four dots.
ollydbg:
It looks like our wxToolBarAddOnXmlHandler has some issues
See image below:
ollydbg:
--- Code: ---<?xml version="1.0" encoding="utf-8" ?>
<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
<object class="wxToolBarAddOn" name="compiler_toolbar">
<object class="tool" name="idCompilerMenuCompile">
<tooltip>Build</tooltip>
<longhelp>Build the active project</longhelp>
<bitmap>images/compile.png</bitmap>
</object>
<object class="tool" name="idCompilerMenuRun">
<tooltip>Run</tooltip>
<longhelp>Run the active project</longhelp>
<bitmap>images/run.png</bitmap>
</object>
<object class="tool" name="idCompilerMenuCompileAndRun">
<tooltip>Build and run</tooltip>
<longhelp>Build and run the active project</longhelp>
<bitmap>images/compilerun.png</bitmap>
</object>
<object class="tool" name="idCompilerMenuRebuild">
<tooltip>Rebuild</tooltip>
<longhelp>Rebuild all modules in the active project</longhelp>
<bitmap>images/rebuild.png</bitmap>
</object>
<object class="tool" name="idCompilerMenuKillProcess">
<tooltip>Abort</tooltip>
<longhelp>Abort the running build process</longhelp>
<bitmap>images/stop.png</bitmap>
<disabled>1</disabled>
</object>
<object class="wxChoice" name="idToolTarget">
<content/>
<size>136,-1</size>
<tooltip>Build target</tooltip>
<longhelp>Select the current build target</longhelp>
</object>
</object>
</resource>
--- End code ---
This is the toolbar's XRC file, and you see the left are 5 icons, and right is a wxChoice.
ollydbg:
The header file:
--- Code: ---class wxXmlResourceHandler;
class DLLIMPORT wxToolBarAddOnXmlHandler : public wxXmlResourceHandler
{
public:
wxToolBarAddOnXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
protected:
bool m_isInside;
bool m_isAddon;
wxToolBar *m_toolbar;
wxBitmap GetCenteredBitmap(const wxString& param = wxT("bitmap"),
const wxArtClient& defaultArtClient = wxART_OTHER,
wxSize size = wxDefaultSize);
};
--- End code ---
And the cpp file:
--- Code: ---#include <wx/xml/xml.h>
/////////////////////////////////////////////////////////////////////////////
// Name: xh_toolb.cpp
// Purpose: XRC resource for wxBoxSizer
// Author: Vaclav Slavik
// Created: 2000/08/11
// RCS-ID: $Id$
// Copyright: (c) 2000 Vaclav Slavik
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Modified by Ricardo Garcia for Code::Blocks
// Comment: Things would've been much easier if field m_isInside had been
// protected instead of private! >:(
/////////////////////////////////////////////////////////////////////////////
wxToolBarAddOnXmlHandler::wxToolBarAddOnXmlHandler()
: wxXmlResourceHandler(), m_isInside(FALSE), m_isAddon(false), m_toolbar(NULL)
{
XRC_ADD_STYLE(wxTB_FLAT);
XRC_ADD_STYLE(wxTB_DOCKABLE);
XRC_ADD_STYLE(wxTB_VERTICAL);
XRC_ADD_STYLE(wxTB_HORIZONTAL);
XRC_ADD_STYLE(wxTB_3DBUTTONS);
XRC_ADD_STYLE(wxTB_TEXT);
XRC_ADD_STYLE(wxTB_NOICONS);
XRC_ADD_STYLE(wxTB_NODIVIDER);
XRC_ADD_STYLE(wxTB_NOALIGN);
}
wxBitmap wxToolBarAddOnXmlHandler::GetCenteredBitmap(const wxString& param,
const wxArtClient& defaultArtClient, wxSize size)
{
wxBitmap bitmap = GetBitmap(param, defaultArtClient, wxDefaultSize);
if (!bitmap.Ok()) // == wxNullBitmap
return bitmap;
int bw = bitmap.GetWidth();
int bh = bitmap.GetHeight();
if (size == wxSize(bw, bh))
return bitmap;
wxImage image = bitmap.ConvertToImage();
int w = size.GetWidth();
int h = size.GetHeight();
int x = (w - bw) / 2;
int y = (h - bh) / 2;
if (image.HasAlpha()) // Resize doesn't handle Alpha... :-(
{
const unsigned char *data = image.GetData();
const unsigned char *alpha = image.GetAlpha();
unsigned char *rgb = (unsigned char *) calloc(w * h, 3);
unsigned char *a = (unsigned char *) calloc(w * h, 1);
// copy Data/Alpha from smaller bitmap to larger bitmap
for (int row = 0; row < bh; row++)
{
memcpy(rgb + ((row + y) * w + x) * 3, data + (row * bw) * 3, bw * 3);
memcpy(a + ((row + y) * w + x), alpha + (row * bw), bw);
}
image = wxImage(w, h, rgb, a);
}
else
image.Resize(size, wxPoint(x,y));
return wxBitmap(image);
}
wxObject *wxToolBarAddOnXmlHandler::DoCreateResource()
{
wxToolBar* toolbar=NULL;
if (m_class == _T("tool"))
{
wxCHECK_MSG(m_toolbar, NULL, _("Incorrect syntax of XRC resource: tool not within a toolbar!"));
wxSize bitmapSize = m_toolbar->GetToolBitmapSize();
if (GetPosition() != wxDefaultPosition)
{
m_toolbar->AddTool(GetID(),
#if wxCHECK_VERSION(3, 0, 0)
wxEmptyString,
#endif
GetCenteredBitmap(_T("bitmap"), wxART_TOOLBAR, bitmapSize),
GetCenteredBitmap(_T("bitmap2"), wxART_TOOLBAR, bitmapSize),
#if !wxCHECK_VERSION(3, 0, 0)
GetBool(_T("toggle")),
GetPosition().x,
GetPosition().y,
NULL,
#else
wxITEM_NORMAL,
#endif
GetText(_T("tooltip")),
GetText(_T("longhelp")));
if (GetBool(_T("disabled")))
{
m_toolbar->Realize();
m_toolbar->EnableTool(GetID(),false);
}
}
else
{
wxItemKind kind = wxITEM_NORMAL;
if (GetBool(_T("radio")))
kind = wxITEM_RADIO;
if (GetBool(_T("toggle")))
{
wxASSERT_MSG( kind == wxITEM_NORMAL,
_("can't have both toggleable and radion button at once") );
kind = wxITEM_CHECK;
}
m_toolbar->AddTool(GetID(),
GetText(_T("label")),
GetCenteredBitmap(_T("bitmap"), wxART_TOOLBAR, bitmapSize),
GetCenteredBitmap(_T("bitmap2"), wxART_TOOLBAR, bitmapSize),
kind,
GetText(_T("tooltip")),
GetText(_T("longhelp")));
if (GetBool(_T("disabled")))
{
m_toolbar->Realize();
m_toolbar->EnableTool(GetID(),false);
}
}
return m_toolbar; // must return non-NULL
}
else if (m_class == _T("separator"))
{
wxCHECK_MSG(m_toolbar, NULL, _("Incorrect syntax of XRC resource: separator not within a toolbar!"));
m_toolbar->AddSeparator();
return m_toolbar; // must return non-NULL
}
else /*<object class="wxToolBar">*/
{
m_isAddon=(m_class == _T("wxToolBarAddOn"));
if(m_isAddon)
{ // special case: Only add items to toolbar
toolbar=(wxToolBar*)m_instance;
// XRC_MAKE_INSTANCE(toolbar, wxToolBar);
}
else
{
int style = GetStyle(_T("style"), wxNO_BORDER | wxTB_HORIZONTAL);
#ifdef __WXMSW__
if (!(style & wxNO_BORDER)) style |= wxNO_BORDER;
#endif
// XRC_MAKE_INSTANCE(toolbar, wxToolBar)
if (m_instance)
toolbar = wxStaticCast(m_instance, wxToolBar);
if (!toolbar)
toolbar = new wxToolBar;
toolbar->Create(m_parentAsWindow,
GetID(),
GetPosition(),
GetSize(),
style,
GetName());
wxSize bmpsize = GetSize(_T("bitmapsize"));
if (!(bmpsize == wxDefaultSize))
toolbar->SetToolBitmapSize(bmpsize);
wxSize margins = GetSize(_T("margins"));
if (!(margins == wxDefaultSize))
toolbar->SetMargins(margins.x, margins.y);
long packing = GetLong(_T("packing"), -1);
if (packing != -1)
toolbar->SetToolPacking(packing);
long separation = GetLong(_T("separation"), -1);
if (separation != -1)
toolbar->SetToolSeparation(separation);
}
wxXmlNode *children_node = GetParamNode(_T("object"));
if (!children_node)
children_node = GetParamNode(_T("object_ref"));
if (children_node == NULL) return toolbar;
m_isInside = TRUE;
m_toolbar = toolbar;
wxXmlNode *n = children_node;
while (n)
{
if ((n->GetType() == wxXML_ELEMENT_NODE) &&
(n->GetName() == _T("object") || n->GetName() == _T("object_ref")))
{
wxObject *created = CreateResFromNode(n, toolbar, NULL);
wxControl *control = wxDynamicCast(created, wxControl);
if (!IsOfClass(n, _T("tool")) &&
!IsOfClass(n, _T("separator")) &&
control != NULL &&
control != toolbar)
{
//Manager::Get()->GetLogManager()->DebugLog(F(_T("control=%p, parent=%p, toolbar=%p"), control, control->GetParent(), toolbar));
toolbar->AddControl(control);
}
}
n = n->GetNext();
}
toolbar->Realize();
m_isInside = FALSE;
m_toolbar = NULL;
if(!m_isAddon)
{
if (m_parentAsWindow && !GetBool(_T("dontattachtoframe")))
{
wxFrame *parentFrame = wxDynamicCast(m_parent, wxFrame);
if (parentFrame)
parentFrame->SetToolBar(toolbar);
}
}
m_isAddon=false;
return toolbar;
}
}
bool wxToolBarAddOnXmlHandler::CanHandle(wxXmlNode *node)
{
// NOTE (mandrav#1#): wxXmlResourceHandler::IsOfClass() doesn't work in unicode (2.6.2)
// Don't ask why. It does this and doesn't work for our custom handler:
// return node->GetPropVal(wxT("class"), wxEmptyString) == classname;
//
// This works though:
// return node->GetPropVal(wxT("class"), wxEmptyString).Matches(classname);
//
// Don't ask me why... >:-|
#if wxCHECK_VERSION(3, 0, 0)
bool istbar = node->GetAttribute(wxT("class"), wxEmptyString).Matches(_T("wxToolBarAddOn"));
bool istool = node->GetAttribute(wxT("class"), wxEmptyString).Matches(_T("tool"));
bool issep = node->GetAttribute(wxT("class"), wxEmptyString).Matches(_T("separator"));
#else
bool istbar = node->GetPropVal(wxT("class"), wxEmptyString).Matches(_T("wxToolBarAddOn"));
bool istool = node->GetPropVal(wxT("class"), wxEmptyString).Matches(_T("tool"));
bool issep = node->GetPropVal(wxT("class"), wxEmptyString).Matches(_T("separator"));
#endif
return ((!m_isInside && istbar) ||
(m_isInside && istool) ||
(m_isInside && issep));
}
--- End code ---
I guess that when wxChoice is added, some extra space is added.
Navigation
[0] Message Index
[#] Next page
Go to full version