projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small changed to wxExtDialog
[wxWidgets.git]
/
samples
/
richedit
/
wxLayout.cpp
diff --git
a/samples/richedit/wxLayout.cpp
b/samples/richedit/wxLayout.cpp
index d00d2a2186eaaf472a355d2ea58429b7271e96c5..86532e650ea595a0ffc539f1370d8c77d2ed2753 100644
(file)
--- a/
samples/richedit/wxLayout.cpp
+++ b/
samples/richedit/wxLayout.cpp
@@
-11,13
+11,13
@@
#pragma implementation "wxLayout.h"
#endif
#pragma implementation "wxLayout.h"
#endif
-#include
"wx/wxprec.h"
+#include
<wx/wxprec.h>
#ifdef __BORLANDC__
# pragma hdrstop
#endif
#include "wxLayout.h"
#ifdef __BORLANDC__
# pragma hdrstop
#endif
#include "wxLayout.h"
-#include
"wx/textfile.h"
+#include
<wx/textfile.h>
#include "Micon.xpm"
#include "Micon.xpm"
@@
-125,6
+125,7
@@
MyFrame::MyFrame(void) :
m_lwin->SetFocus();
Clear();
m_lwin->SetFocus();
Clear();
+#if 0
// create and set the background bitmap (this will result in a lattice)
static const int sizeBmp = 10;
wxBitmap *bitmap = new wxBitmap(sizeBmp, sizeBmp);
// create and set the background bitmap (this will result in a lattice)
static const int sizeBmp = 10;
wxBitmap *bitmap = new wxBitmap(sizeBmp, sizeBmp);
@@
-140,6
+141,7
@@
MyFrame::MyFrame(void) :
dcMem.SelectObject( wxNullBitmap );
m_lwin->SetBackgroundBitmap(bitmap);
dcMem.SelectObject( wxNullBitmap );
m_lwin->SetBackgroundBitmap(bitmap);
+#endif // 0
};
void
};
void
@@
-236,7
+238,9
@@
MyFrame::AddSampleText(wxLayoutList *llist)
void
MyFrame::Clear(void)
{
void
MyFrame::Clear(void)
{
- m_lwin->Clear(wxROMAN,16,wxNORMAL,wxNORMAL, false);
+ wxColour colBg(0, 0, 0);
+
+ m_lwin->Clear(wxROMAN,16,wxNORMAL,wxNORMAL, false, wxRED, &colBg);
}
}
@@
-328,7
+332,7
@@
void MyFrame::OnCommand( wxCommandEvent &event )
{
wxString line;
wxLayoutList *llist = m_lwin->GetLayoutList();
{
wxString line;
wxLayoutList *llist = m_lwin->GetLayoutList();
- for(int i = 1; i <
50
00; i++)
+ for(int i = 1; i <
3
00; i++)
{
line.Printf("This is line number %d.", i);
llist->Insert(line);
{
line.Printf("This is line number %d.", i);
llist->Insert(line);