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

Added bakefiles for contrib/utils/convertrc and contrib/utils/wxrcedit

Browse Source 
and regenerated makefiles.
  various compilation and warning fixes for recent changes and for
WXWIN_COMPATIBILITY_2_4==0.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-09-10 20:53:01 +00:00
parent e57f3c5d95
commit c74caa095c
24 changed files with 447 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/utils/wxrcedit/splittree.cpp
View File

@@ -18,7 +18,7 @@
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
#ifdef __GNUG__
#if defined(__GNUG__) && !defined(__APPLE__)
#pragma implementation "splittree.h"
#endif
@@ -332,9 +332,9 @@ void wxRemotelyScrolledTreeCtrl::CalcTreeSize(const wxTreeItemId& id, wxRect& re
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);
@@ -495,6 +495,10 @@ wxThinSplitterWindow::wxThinSplitterWindow(wxWindow* parent, wxWindowID id,
{
}
wxThinSplitterWindow::~wxThinSplitterWindow()
{
}
void wxThinSplitterWindow::SizeWindows()
{
// The client size may have changed inbetween
@@ -512,7 +516,7 @@ bool wxThinSplitterWindow::SashHitTest(int x, int y, int tolerance)
void wxThinSplitterWindow::DrawSash(wxDC& dc)
{
if ( m_sashPosition == 0 || !m_windowTwo)
if ( GetSashPosition() == 0 || !m_windowTwo)
return;
if (GetWindowStyle() & wxSP_NOSASH)
return;
@@ -532,7 +536,7 @@ void wxThinSplitterWindow::DrawSash(wxDC& dc)
{
y1 = 2; h1 -= 3;
}
dc.DrawRectangle(m_sashPosition, y1, m_sashSize, h1);
dc.DrawRectangle(GetSashPosition(), y1, GetSashSize(), h1);
}
else
{
@@ -546,7 +550,7 @@ void wxThinSplitterWindow::DrawSash(wxDC& dc)
{
x1 = 2; w1 -= 3;
}
dc.DrawRectangle(x1, m_sashPosition, w1, m_sashSize);
dc.DrawRectangle(x1, GetSashPosition(), w1, GetSashSize());
}
dc.SetPen(wxNullPen);