// headers
// -----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "treectlg.h"
#endif
else
flags |= wxTREE_HITTEST_ONITEMLOWERPART;
- // 5 is the size of the plus sign
int xCross = m_x - theCtrl->GetSpacing();
+#ifdef __WXMAC__
+ // according to the drawing code the triangels are drawn
+ // at -4 , -4 from the position up to +10/+10 max
+ if ((point.x > xCross-4) && (point.x < xCross+10) &&
+ (point.y > y_mid-4) && (point.y < y_mid+10) &&
+ HasPlus() && theCtrl->HasButtons() )
+#else
+ // 5 is the size of the plus sign
if ((point.x > xCross-5) && (point.x < xCross+5) &&
(point.y > y_mid-5) && (point.y < y_mid+5) &&
HasPlus() && theCtrl->HasButtons() )
+#endif
{
flags |= wxTREE_HITTEST_ONITEMBUTTON;
return this;
size_t *pIndex = (size_t *)&cookie;
if ( *pIndex < children.Count() )
{
- return children.Item(*pIndex++);
+ return children.Item((*pIndex)++);
}
else
{
}
else // no custom buttons
{
- static const int wImage = 10;
- static const int hImage = 12;
+ static const int wImage = 9;
+ static const int hImage = 9;
wxRendererNative::Get().DrawTreeItemButton
(
if (!next)
{
wxTreeItemId current = m_key_current;
- while (current && !next)
+ while (current.IsOk() && !next)
{
current = GetItemParent( current );
if (current) next = GetNextSibling( current );