X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/668e4f17be1fdeab2d08fc6d472d585447894aa7..519cb848a8f4c91c73421bb75314754284e593a4:/samples/richedit/wxLayout.cpp

diff --git a/samples/richedit/wxLayout.cpp b/samples/richedit/wxLayout.cpp
index d00d2a2186..15d14b81ee 100644
--- a/samples/richedit/wxLayout.cpp
+++ b/samples/richedit/wxLayout.cpp
@@ -11,14 +11,15 @@
 #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 <iostream.h>
 
 #include   "Micon.xpm"
 
@@ -123,8 +124,15 @@ MyFrame::MyFrame(void) :
    m_lwin->SetEditable(true);
    m_lwin->SetWrapMargin(40);
    m_lwin->SetFocus();
+
+   // JACS: under MSW, the window doesn't show the caret initially,
+   // and the following line I added doesn't help either.
+   // going to another window and then back again fixes it.
+   // m_lwin->OnSetFocus(wxFocusEvent());
+
    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);
@@ -140,6 +148,7 @@ MyFrame::MyFrame(void) :
    dcMem.SelectObject( wxNullBitmap );
 
    m_lwin->SetBackgroundBitmap(bitmap);
+#endif // 0
 };
 
 void
@@ -236,7 +245,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);
 }
 
 
@@ -289,38 +300,40 @@ void MyFrame::OnCommand( wxCommandEvent &event )
       m_lwin->Cut();
       m_lwin->Refresh(FALSE);
       break;
+#ifdef M_BASEDIR
    case ID_FIND:
       m_lwin->Find("void");
       m_lwin->Refresh(FALSE);
       break;
+#endif
    case ID_HTML:
    {
-      wxLayoutExportObject *export;
+      wxLayoutExportObject *export0;
       wxLayoutExportStatus status(m_lwin->GetLayoutList());
 
-      while((export = wxLayoutExport( &status,
+      while((export0 = wxLayoutExport( &status,
                                       WXLO_EXPORT_AS_HTML)) != NULL)
       {
-         if(export->type == WXLO_EXPORT_HTML)
-            cout << *(export->content.text);
+         if(export0->type == WXLO_EXPORT_HTML)
+            cout << *(export0->content.text);
          else
             cout << "<!--UNKNOWN OBJECT>";
-         delete export;
+         delete export0;
       }
    }
    break;
    case ID_TEXT:
    {
-      wxLayoutExportObject *export;
+      wxLayoutExportObject *export0;
       wxLayoutExportStatus status(m_lwin->GetLayoutList());
 
-      while((export = wxLayoutExport( &status, WXLO_EXPORT_AS_TEXT)) != NULL)
+      while((export0 = wxLayoutExport( &status, WXLO_EXPORT_AS_TEXT)) != NULL)
       {
-         if(export->type == WXLO_EXPORT_TEXT)
-            cout << *(export->content.text);
+         if(export0->type == WXLO_EXPORT_TEXT)
+            cout << *(export0->content.text);
          else
             cout << "<!--UNKNOWN OBJECT>";
-         delete export;
+         delete export0;
       }
    }
    break;
@@ -328,7 +341,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);