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

Mac build fixes after latest change (closes #10433)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-25 19:18:58 +00:00
parent 428f8b0610
commit ec676e4ff1
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/generic/treectlg.cpp
View File

@@ -432,24 +432,24 @@ wxTreeTextCtrl::wxTreeTextCtrl(wxGenericTreeCtrl *owner,
wxRect rect; wxRect rect;
m_owner->GetBoundingRect(m_itemEdited, rect, true); m_owner->GetBoundingRect(m_itemEdited, rect, true);
// corrects possition and size for better apperance // corrects position and size for better appearance
#ifdef __WXMSW__ #ifdef __WXMSW__
rect.x -= 5; rect.x -= 5;
rect.width += 10; rect.width += 10;
#elif __WXGTK__ #elif defined(__WXGTK__)
rect.x -= 5; rect.x -= 5;
rect.y -= 2; rect.y -= 2;
rect.width += 8; rect.width += 8;
rect.height += 4; rect.height += 4;
#elif __WXMAC__ #elif defined(__WXMAC__)
wxSize bs = DoGetBestSize(); int bestHeight = GetBestSize().y - 8;
// edit control height if ( rect.height > bestHeight )
if ( rect.height > bs.y - 8 ) {
int diff = rect.height - ( bs.y - 8 ); int diff = rect.height - bestHeight;
rect.height -= diff; rect.height -= diff;
rect.y += diff / 2; rect.y += diff / 2;
} }
#endif #endif // platforms
(void)Create(m_owner, wxID_ANY, m_startValue, (void)Create(m_owner, wxID_ANY, m_startValue,
rect.GetPosition(), rect.GetSize()); rect.GetPosition(), rect.GetSize());
@@ -966,7 +966,7 @@ void wxGenericTreeCtrl::Init()
m_findTimer = NULL; m_findTimer = NULL;
m_dropEffectAboveItem = false; m_dropEffectAboveItem = false;
m_dndEffect = NoEffect; m_dndEffect = NoEffect;
m_dndEffectItem = NULL; m_dndEffectItem = NULL;
@@ -2625,7 +2625,7 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
// restore normal font // restore normal font
dc.SetFont( m_normalFont ); dc.SetFont( m_normalFont );
if (item == m_dndEffectItem) if (item == m_dndEffectItem)
{ {
dc.SetPen( *wxBLACK_PEN ); dc.SetPen( *wxBLACK_PEN );
@@ -2905,7 +2905,7 @@ void wxGenericTreeCtrl::DrawBorder(const wxTreeItemId &item)
m_dndEffect = NoEffect; m_dndEffect = NoEffect;
m_dndEffectItem = NULL; m_dndEffectItem = NULL;
} }
wxRect rect( i->GetX()-1, i->GetY()-1, i->GetWidth()+2, GetLineHeight(i)+2 ); wxRect rect( i->GetX()-1, i->GetY()-1, i->GetWidth()+2, GetLineHeight(i)+2 );
CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
RefreshRect( rect ); RefreshRect( rect );
@@ -2930,7 +2930,7 @@ void wxGenericTreeCtrl::DrawLine(const wxTreeItemId &item, bool below)
m_dndEffect = NoEffect; m_dndEffect = NoEffect;
m_dndEffectItem = NULL; m_dndEffectItem = NULL;
} }
wxRect rect( i->GetX()-1, i->GetY()-1, i->GetWidth()+2, GetLineHeight(i)+2 ); wxRect rect( i->GetX()-1, i->GetY()-1, i->GetWidth()+2, GetLineHeight(i)+2 );
CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
RefreshRect( rect ); RefreshRect( rect );