X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da16935f6cbe92f26a1168b227ef89aabb0b22c7..8dbf458911c24bae120bed07d5627a65f362b8d1:/samples/richedit/wxLayout.cpp

diff --git a/samples/richedit/wxLayout.cpp b/samples/richedit/wxLayout.cpp
index 265ead4ebc..86532e650e 100644
--- a/samples/richedit/wxLayout.cpp
+++ b/samples/richedit/wxLayout.cpp
@@ -11,13 +11,13 @@
 #pragma implementation "wxLayout.h"
 #endif
 
-#include "wx/wxprec.h"
+#include <wx/wxprec.h>
 #ifdef __BORLANDC__
 #  pragma hdrstop
 #endif
 
 #include "wxLayout.h"
-#include "wx/textfile.h"
+#include <wx/textfile.h>
 
 
 #include   "Micon.xpm"
@@ -33,19 +33,22 @@ IMPLEMENT_APP(MyApp)
 // MyFrame
 //-----------------------------------------------------------------------------
 
-   enum ids{ ID_ADD_SAMPLE = 1, ID_CLEAR, ID_PRINT,
-             ID_PRINT_SETUP, ID_PAGE_SETUP, ID_PREVIEW, ID_PRINT_PS,
-             ID_PRINT_SETUP_PS, ID_PAGE_SETUP_PS,ID_PREVIEW_PS,
-             ID_WRAP, ID_NOWRAP, ID_PASTE, ID_COPY, ID_CUT,
-             ID_PASTE_PRIMARY,
-             ID_FIND,
-             ID_WXLAYOUT_DEBUG, ID_QUIT, ID_CLICK, ID_HTML, ID_TEXT,
-             ID_TEST, ID_LINEBREAKS_TEST, ID_LONG_TEST, ID_URL_TEST };
+enum ids
+{
+    ID_ADD_SAMPLE = 1, ID_CLEAR, ID_PRINT,
+    ID_PRINT_SETUP, ID_PAGE_SETUP, ID_PREVIEW, ID_PRINT_PS,
+    ID_PRINT_SETUP_PS, ID_PAGE_SETUP_PS,ID_PREVIEW_PS,
+    ID_WRAP, ID_NOWRAP, ID_PASTE, ID_COPY, ID_CUT,
+    ID_PASTE_PRIMARY,
+    ID_FIND,
+    ID_WXLAYOUT_DEBUG, ID_QUIT, ID_CLICK, ID_HTML, ID_TEXT,
+    ID_TEST, ID_LINEBREAKS_TEST, ID_LONG_TEST, ID_URL_TEST
+};
 
 
 IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
 
-   BEGIN_EVENT_TABLE(MyFrame,wxFrame)
+BEGIN_EVENT_TABLE(MyFrame,wxFrame)
    EVT_MENU(ID_PRINT, MyFrame::OnPrint)
    EVT_MENU(ID_PREVIEW, MyFrame::OnPrintPreview)
    EVT_MENU(ID_PRINT_SETUP, MyFrame::OnPrintSetup)
@@ -57,7 +60,7 @@ IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
    EVT_MENU    (-1,       MyFrame::OnCommand)
    EVT_COMMAND (-1,-1,    MyFrame::OnCommand)
    EVT_CHAR    (  wxLayoutWindow::OnChar  )
-   END_EVENT_TABLE()
+END_EVENT_TABLE()
 
 
 MyFrame::MyFrame(void) :
@@ -119,9 +122,10 @@ MyFrame::MyFrame(void) :
    m_lwin->SetMouseTracking(true);
    m_lwin->SetEditable(true);
    m_lwin->SetWrapMargin(40);
-   m_lwin->Clear(wxROMAN,16,wxNORMAL,wxNORMAL, false);
    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);
@@ -137,6 +141,7 @@ MyFrame::MyFrame(void) :
    dcMem.SelectObject( wxNullBitmap );
 
    m_lwin->SetBackgroundBitmap(bitmap);
+#endif // 0
 };
 
 void
@@ -233,7 +238,9 @@ MyFrame::AddSampleText(wxLayoutList *llist)
 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);
 }
 
 
@@ -325,7 +332,7 @@ void MyFrame::OnCommand( wxCommandEvent &event )
    {
       wxString line;
       wxLayoutList *llist = m_lwin->GetLayoutList();
-      for(int i = 1; i < 5000; i++)
+      for(int i = 1; i < 300; i++)
       {
          line.Printf("This is line number %d.", i);
          llist->Insert(line);