// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
#pragma implementation "splittree.h"
#endif
#include "wx/wx.h"
#endif
-#include "wx/generic/treectlg.h"
+#ifdef __WXMSW__
+#include <windows.h>
+#include "wx/msw/winundef.h"
+#endif
-#include "splittree.h"
+#include "wx/gizmos/splittree.h"
+#include <math.h>
/*
* wxRemotelyScrolledTreeCtrl
void wxRemotelyScrolledTreeCtrl::HideVScrollbar()
{
-#ifdef __WXMSW__
+#if defined(__WXMSW__) && USE_GENERIC_TREECTRL
if (!IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
{
::ShowScrollBar((HWND) GetHWND(), SB_VERT, FALSE);
// Number of pixels per user unit (0 or -1 for no scrollbar)
// Length of virtual canvas in user units
// Length of page in user units
+#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
void wxRemotelyScrolledTreeCtrl::SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
int noUnitsX, int noUnitsY,
int xPos, int yPos,
scrolledWindow->SetScrollbars(0, pixelsPerUnitY, 0, noUnitsY, 0, yPos, noRefresh);
}
}
+#else
+void wxRemotelyScrolledTreeCtrl::SetScrollbars(int WXUNUSED(pixelsPerUnitX), int WXUNUSED(pixelsPerUnitY),
+ int WXUNUSED(noUnitsX), int WXUNUSED(noUnitsY),
+ int WXUNUSED(xPos), int WXUNUSED(yPos),
+ bool WXUNUSED(noRefresh))
+{
+#endif
}
// In case we're using the generic tree control.
+#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
int wxRemotelyScrolledTreeCtrl::GetScrollPos(int orient) const
{
wxScrolledWindow* scrolledWindow = GetScrolledWindow();
return scrolledWindow->GetScrollPos(orient);
}
}
+#else
+int wxRemotelyScrolledTreeCtrl::GetScrollPos(int WXUNUSED(orient)) const
+{
+#endif
return 0;
}
{
wxScrolledWindow* scrolledWindow = GetScrolledWindow();
+#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
if (IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
{
* y = y2;
}
else
+#endif
{
// x is wrong since the horizontal scrollbar is controlled by the
// tree control, but we probably don't need it.
}
// In case we're using the generic tree control.
+#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
void wxRemotelyScrolledTreeCtrl::PrepareDC(wxDC& dc)
{
if (IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
scrolledWindow->GetScrollPixelsPerUnit(& xppu2, & yppu2);
dc.SetDeviceOrigin( -startX * xppu1, -startY * yppu2 );
- //dc.SetUserScale( win->GetScaleX(), win->GetScaleY() );
+ // dc.SetUserScale( win->GetScaleX(), win->GetScaleY() );
}
+#else
+void wxRemotelyScrolledTreeCtrl::PrepareDC(wxDC& WXUNUSED(dc))
+{
+#endif
}
// Scroll to the given line (in scroll units where each unit is
// the height of an item)
-void wxRemotelyScrolledTreeCtrl::ScrollToLine(int posHoriz, int posVert)
+void wxRemotelyScrolledTreeCtrl::ScrollToLine(int WXUNUSED(posHoriz), int posVert)
{
#ifdef __WXMSW__
+#if USE_GENERIC_TREECTRL
if (!IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
+#endif
{
UINT sbCode = SB_THUMBPOSITION;
HWND vertScrollBar = 0;
MSWDefWindowProc((WXUINT) WM_VSCROLL, MAKELONG(sbCode, posVert), (WXHWND) vertScrollBar);
}
+#if USE_GENERIC_TREECTRL
else
#endif
+#endif
+#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
{
wxGenericTreeCtrl* win = (wxGenericTreeCtrl*) this;
win->Refresh();
}
*/
}
+#endif
}
void wxRemotelyScrolledTreeCtrl::OnSize(wxSizeEvent& event)
// Adjust the containing wxScrolledWindow's scrollbars appropriately
void wxRemotelyScrolledTreeCtrl::AdjustRemoteScrollbars()
{
+#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
if (IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
{
// This is for the generic tree control.
return;
}
else
+#endif
{
// This is for the wxMSW tree control
wxScrolledWindow* scrolledWindow = GetScrolledWindow();
wxRect itemRect;
if (GetBoundingRect(GetRootItem(), itemRect))
{
- int itemHeight = itemRect.GetHeight();
+ // Actually, the real height seems to be 1 less than reported
+ // (e.g. 16 instead of 16)
+ int itemHeight = itemRect.GetHeight() - 1;
int w, h;
GetClientSize(&w, &h);
wxRect rect(0, 0, 0, 0);
CalcTreeSize(rect);
- int treeViewHeight = rect.GetHeight()/itemHeight;
+
+ double f = ((double) (rect.GetHeight()) / (double) itemHeight) ;
+ int treeViewHeight = (int) ceil(f);
int scrollPixelsPerLine = itemHeight;
int scrollPos = - (itemRect.y / itemHeight);
void wxRemotelyScrolledTreeCtrl::CalcTreeSize(const wxTreeItemId& id, wxRect& rect)
{
- // TODO: implement GetFirst/NextVisibleItem
- // for wxGenericTreeCtrl, plus GetBoundingRect.
-
// More efficient implementation would be to find the last item (but how?)
// Q: is the bounding rect relative to the top of the virtual tree workspace
// or the top of the window? How would we convert?
rect = CombineRectangles(rect, itemSize);
}
- long cookie;
+ void* cookie;
wxTreeItemId childId = GetFirstChild(id, cookie);
- while (childId != 0)
+ while (childId)
{
CalcTreeSize(childId, rect);
childId = GetNextChild(childId, cookie);
#endif
}
-void wxTreeCompanionWindow::OnPaint(wxPaintEvent& event)
+void wxTreeCompanionWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
{
wxPaintDC dc(this);
if (!m_treeCtrl)
return;
- wxPen pen(wxColour(_T("BLACK")), 1, wxSOLID);
+ wxPen pen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);
dc.SetPen(pen);
dc.SetBrush(* wxTRANSPARENT_BRUSH);
- wxFont font(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
dc.SetFont(font);
wxSize clientSize = GetClientSize();
Refresh(TRUE);
}
-void wxTreeCompanionWindow::OnExpand(wxTreeEvent& event)
+void wxTreeCompanionWindow::OnExpand(wxTreeEvent& WXUNUSED(event))
{
// TODO: something more optimized than simply refresh the whole
// window when the tree is expanded/collapsed. Tricky.
{
}
+wxThinSplitterWindow::~wxThinSplitterWindow()
+{
+}
+
void wxThinSplitterWindow::SizeWindows()
{
// The client size may have changed inbetween
}
// Tests for x, y over sash
-bool wxThinSplitterWindow::SashHitTest(int x, int y, int tolerance)
+bool wxThinSplitterWindow::SashHitTest(int x, int y, int WXUNUSED(tolerance))
{
return wxSplitterWindow::SashHitTest(x, y, 4);
}
void wxThinSplitterWindow::DrawSash(wxDC& dc)
{
- if ( m_sashPosition == 0 || !m_windowTwo)
+ if ( GetSashPosition() == 0 || !m_windowTwo)
return;
if (GetWindowStyle() & wxSP_NOSASH)
return;
{
y1 = 2; h1 -= 3;
}
- dc.DrawRectangle(m_sashPosition, y1, m_sashSize, h1);
+ dc.DrawRectangle(GetSashPosition(), y1, GetSashSize(), h1);
}
else
{
{
x1 = 2; w1 -= 3;
}
- dc.DrawRectangle(x1, m_sashPosition, w1, m_sashSize);
+ dc.DrawRectangle(x1, GetSashPosition(), w1, GetSashSize());
}
dc.SetPen(wxNullPen);
{
}
-void wxSplitterScrolledWindow::OnSize(wxSizeEvent& event)
+void wxSplitterScrolledWindow::OnSize(wxSizeEvent& WXUNUSED(event))
{
wxSize sz = GetClientSize();
- if (GetChildren().First())
+ if (GetChildren().GetFirst())
{
- ((wxWindow*) GetChildren().First()->Data())->SetSize(0, 0, sz.x, sz.y);
+ ((wxWindow*) GetChildren().GetFirst()->GetData())->SetSize(0, 0, sz.x, sz.y);
}
}
// don't cause an infinite loop
static bool inOnScroll = FALSE;
if (inOnScroll)
+ {
+ event.Skip();
return;
+ }
inOnScroll = TRUE;
-
+
int orient = event.GetOrientation();
- int nScrollInc = 16;// FIXME CalcScrollInc(event);
+ int nScrollInc = CalcScrollInc(event);
if (nScrollInc == 0)
{
inOnScroll = FALSE;
}
// Find targets in splitter window and send the event to them
- wxNode* node = GetChildren().First();
+ wxNode* node = (wxNode *)GetChildren().GetFirst();
while (node)
{
- wxWindow* child = (wxWindow*) node->Data();
+ wxWindow* child = (wxWindow*) node->GetData();
if (child->IsKindOf(CLASSINFO(wxSplitterWindow)))
{
wxSplitterWindow* splitter = (wxSplitterWindow*) child;
splitter->GetWindow2()->ProcessEvent(event);
break;
}
- node = node->Next();
+ node = node->GetNext();
}
#ifdef __WXMAC__
projects / wxWidgets.git / blobdiff