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

Compile fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2003-07-22 01:10:04 +00:00
parent d99859e492
commit 0199503bf0
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/include/wx/gizmos/splittree.h
View File

@ -170,6 +170,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& sz = wxDefaultSize, const wxSize& sz = wxDefaultSize,
long style = wxSP_3D | wxCLIP_CHILDREN); long style = wxSP_3D | wxCLIP_CHILDREN);
~wxThinSplitterWindow();
//// Overrides //// Overrides
@ -189,6 +190,9 @@ public:
//// Data members //// Data members
protected: protected:
wxPen* m_facePen;
wxBrush* m_faceBrush;
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };

16
contrib/src/gizmos/splittree.cpp
View File

@ -381,7 +381,7 @@ void wxRemotelyScrolledTreeCtrl::CalcTreeSize(const wxTreeItemId& id, wxRect& re
rect = CombineRectangles(rect, itemSize); rect = CombineRectangles(rect, itemSize);
} }
long cookie; wxTreeItemIdValue cookie;
wxTreeItemId childId = GetFirstChild(id, cookie); wxTreeItemId childId = GetFirstChild(id, cookie);
while (childId != 0) while (childId != 0)
{ {
@ -542,8 +542,18 @@ wxThinSplitterWindow::wxThinSplitterWindow(wxWindow* parent, wxWindowID id,
long style): long style):
wxSplitterWindow(parent, id, pos, sz, style) wxSplitterWindow(parent, id, pos, sz, style)
{ {
wxColour faceColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
m_facePen = new wxPen(faceColour, 1, wxSOLID);
m_faceBrush = new wxBrush(faceColour, wxSOLID);
} }
wxThinSplitterWindow::~wxThinSplitterWindow()
{
delete m_facePen;
delete m_faceBrush;
}
void wxThinSplitterWindow::SizeWindows() void wxThinSplitterWindow::SizeWindows()
{ {
// The client size may have changed inbetween // The client size may have changed inbetween
@ -581,7 +591,7 @@ void wxThinSplitterWindow::DrawSash(wxDC& dc)
{ {
y1 = 2; h1 -= 3; y1 = 2; h1 -= 3;
} }
dc.DrawRectangle(m_sashPosition, y1, m_sashSize, h1); dc.DrawRectangle(m_sashPosition, y1, GetSashSize(), h1);
} }
else else
{ {
@ -595,7 +605,7 @@ void wxThinSplitterWindow::DrawSash(wxDC& dc)
{ {
x1 = 2; w1 -= 3; x1 = 2; w1 -= 3;
} }
dc.DrawRectangle(x1, m_sashPosition, w1, m_sashSize); dc.DrawRectangle(x1, m_sashPosition, w1, GetSashSize());
} }
dc.SetPen(wxNullPen); dc.SetPen(wxNullPen);

1
contrib/src/gizmos/statpict.cpp
View File

@ -13,6 +13,7 @@
#pragma implementation "statpict.h" #pragma implementation "statpict.h"
#endif #endif
#include "wx/wxprec.h"
#include "wx/defs.h" #include "wx/defs.h"
#include "wx/gizmos/statpict.h" #include "wx/gizmos/statpict.h"