fix for focus handling in generic wxListCtrl

[wxWidgets.git] / samples / text / text.cpp

diff --git a/samples/text/text.cpp b/samples/text/text.cpp
index 05cd37a94e2a89f273f4135a0e644cc26961e99b..7e872901669c43cee5a4d007cf0c1d4b6ab19f98 100644 (file)
--- a/samples/text/text.cpp
+++ b/samples/text/text.cpp
@@ -733,7 +733,9 @@ END_EVENT_TABLE()
 MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
        : wxPanel( frame, -1, wxPoint(x, y), wxSize(w, h) )
 {
 MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
        : wxPanel( frame, -1, wxPoint(x, y), wxSize(w, h) )
 {

-    m_log = new wxTextCtrl( this, -1, "This is the log window.\n", wxPoint(5,260), wxSize(630,100), wxTE_MULTILINE );
+    m_log = new wxTextCtrl( this, -1, "This is the log window.\n",
+                            wxPoint(5,260), wxSize(630,100),
+                            wxTE_MULTILINE | wxTE_READONLY /* | wxTE_RICH */);

 
     wxLog *old_log = wxLog::SetActiveTarget( new wxLogTextCtrl( m_log ) );
 
 
     wxLog *old_log = wxLog::SetActiveTarget( new wxLogTextCtrl( m_log ) );
 


@@ -829,7 +831,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
                                 wxPoint(450, 10), wxSize(230, 230),
                                 wxTE_RICH |
                                 wxTE_MULTILINE |
                                 wxPoint(450, 10), wxSize(230, 230),
                                 wxTE_RICH |
                                 wxTE_MULTILINE |

-                                wxTE_AUTO_URL |
+                                // wxTE_AUTO_URL |

                                 wxHSCROLL);
 
 #if 1
                                 wxHSCROLL);
 
 #if 1