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

background bitmap test added, other minor fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-06-05 22:38:07 +00:00
parent b480d85128
commit 7cc7f0eb18
3 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
user/wxLayout/wxLayout.cpp
View File

@@ -116,6 +116,22 @@ MyFrame::MyFrame(void) :
m_lwin->SetWrapMargin(40); m_lwin->SetWrapMargin(40);
m_lwin->Clear(wxROMAN,16,wxNORMAL,wxNORMAL, false); m_lwin->Clear(wxROMAN,16,wxNORMAL,wxNORMAL, false);
m_lwin->SetFocus(); m_lwin->SetFocus();
// create and set the background bitmap (this will result in a lattice)
static const int sizeBmp = 10;
wxBitmap *bitmap = new wxBitmap(sizeBmp, sizeBmp);
wxMemoryDC dcMem;
dcMem.SelectObject( *bitmap );
dcMem.SetBackground( *wxWHITE_BRUSH );
dcMem.Clear();
dcMem.SetPen( *wxGREEN_PEN );
dcMem.DrawLine(sizeBmp/2, 0, sizeBmp/2, sizeBmp);
dcMem.DrawLine(0, sizeBmp/2, sizeBmp, sizeBmp/2);
dcMem.SelectObject( wxNullBitmap );
m_lwin->SetBackgroundBitmap(bitmap);
}; };
void void

12
user/wxLayout/wxllist.cpp
View File

@@ -2566,13 +2566,15 @@ wxLayoutList::ApplyStyle(wxLayoutStyleInfo *si, wxDC &dc)
void void
wxLayoutList::Debug(void) wxLayoutList::Debug(void)
{ {
WXLO_DEBUG(("Cursor is in line %d, screen pos = (%d, %d)",
m_CursorLine->GetLineNumber(),
m_CursorScreenPos.x, m_CursorScreenPos.y));
wxLayoutLine *line; wxLayoutLine *line;
for(line = m_FirstLine; line; line = line->GetNextLine())
{
for(line = m_FirstLine;
line;
line = line->GetNextLine())
line->Debug(); line->Debug();
}
} }
#endif #endif

2
user/wxLayout/wxlwindow.cpp
View File

@@ -558,7 +558,7 @@ wxLayoutWindow::ScrollToCursor(void)
// Make sure that the scrollbars are at a position so that the cursor is // Make sure that the scrollbars are at a position so that the cursor is
// visible if we are editing // visible if we are editing
WXLO_DEBUG(("m_ScrollToCursor = %d", (int) m_ScrollToCursor)); WXLO_DEBUG(("m_ScrollToCursor = %d", (int) m_ScrollToCursor));
wxPoint cc = m_llist->GetCursorScreenPos(*m_memDC); wxPoint cc = m_llist->GetCursorScreenPos(dc);
// the cursor should be completely visible in both directions // the cursor should be completely visible in both directions
wxPoint cs(m_llist->GetCursorSize()); wxPoint cs(m_llist->GetCursorSize());