Committing in .

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

diff --git a/samples/text/text.cpp b/samples/text/text.cpp
index af3246f4a156384ac5120745b89a5b0eae1de5d4..30a3dc55dff3e0137965d054bb20f682df64329b 100644 (file)
--- a/samples/text/text.cpp
+++ b/samples/text/text.cpp
@@ -210,6 +210,11 @@ public:
         MyTextCtrl::ms_logText = event.IsChecked();
     }
 
         MyTextCtrl::ms_logText = event.IsChecked();
     }
 

+    void OnSetText(wxCommandEvent& event)
+    {
+        m_panel->m_text->SetValue(_T("Hello, world (what else did you expect)?"));
+    }
+

     void OnIdle( wxIdleEvent& event );
 
 private:
     void OnIdle( wxIdleEvent& event );
 
 private:


@@ -271,6 +276,7 @@ enum
     TEXT_PAGE_DOWN,
     TEXT_PAGE_UP,
     TEXT_REMOVE,
     TEXT_PAGE_DOWN,
     TEXT_PAGE_UP,
     TEXT_REMOVE,

+    TEXT_SET,

 
     // log menu
     TEXT_LOG_KEY,
 
     // log menu
     TEXT_LOG_KEY,


@@ -324,6 +330,7 @@ bool MyApp::OnInit()
     menuText->Append(TEXT_ADD_SOME, "&Append some text\tCtrl-A");
     menuText->Append(TEXT_ADD_FREEZE, "&Append text with freeze/thaw\tShift-Ctrl-A");
     menuText->Append(TEXT_REMOVE, "&Remove first 10 characters\tCtrl-X");
     menuText->Append(TEXT_ADD_SOME, "&Append some text\tCtrl-A");
     menuText->Append(TEXT_ADD_FREEZE, "&Append text with freeze/thaw\tShift-Ctrl-A");
     menuText->Append(TEXT_REMOVE, "&Remove first 10 characters\tCtrl-X");

+    menuText->Append(TEXT_SET, "&Set the first text zone value\tCtrl-E");

     menuText->AppendSeparator();
     menuText->Append(TEXT_MOVE_ENDTEXT, "Move cursor to the end of &text");
     menuText->Append(TEXT_MOVE_ENDENTRY, "Move cursor to the end of &entry");
     menuText->AppendSeparator();
     menuText->Append(TEXT_MOVE_ENDTEXT, "Move cursor to the end of &text");
     menuText->Append(TEXT_MOVE_ENDENTRY, "Move cursor to the end of &entry");


@@ -678,7 +685,7 @@ void MyTextCtrl::OnKeyDown(wxKeyEvent& event)
             else
             {
                 wxLogDebug( wxT("Stopped capturing mouse and events.") );
             else
             {
                 wxLogDebug( wxT("Stopped capturing mouse and events.") );

-                m_hasCapture = TRUE;
+                m_hasCapture = FALSE;

                 ReleaseMouse();
             }
             break;
                 ReleaseMouse();
             }
             break;


@@ -726,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 ) );
 


@@ -781,7 +790,11 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
                 m_horizontal->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxNORMAL,
                                              FALSE, "",
                                              wxFONTENCODING_CP1251));
                 m_horizontal->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxNORMAL,
                                              FALSE, "",
                                              wxFONTENCODING_CP1251));

+#if wxUSE_UNICODE
+                m_horizontal->SetValue(L"\x0412\x0430\x0434\x0438\x043c \x0426");
+#else

                 m_horizontal->SetValue("ËÁÖÅÔÓÑ ÕÄÁÞÎÙÍ");
                 m_horizontal->SetValue("ËÁÖÅÔÓÑ ÕÄÁÞÎÙÍ");

+#endif

         }
     }
     else
         }
     }
     else


@@ -818,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


@@ -983,7 +996,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(TEXT_LOG_CHAR, MyFrame::OnLogChar)
     EVT_MENU(TEXT_LOG_MOUSE,MyFrame::OnLogMouse)
     EVT_MENU(TEXT_LOG_TEXT, MyFrame::OnLogText)
     EVT_MENU(TEXT_LOG_CHAR, MyFrame::OnLogChar)
     EVT_MENU(TEXT_LOG_MOUSE,MyFrame::OnLogMouse)
     EVT_MENU(TEXT_LOG_TEXT, MyFrame::OnLogText)

-    EVT_MENU(TEXT_CLEAR,  MyFrame::OnLogClear)
+    EVT_MENU(TEXT_CLEAR,    MyFrame::OnLogClear)

 
 #if wxUSE_TOOLTIPS
     EVT_MENU(TEXT_TOOLTIPS_SETDELAY,  MyFrame::OnSetTooltipDelay)
 
 #if wxUSE_TOOLTIPS
     EVT_MENU(TEXT_TOOLTIPS_SETDELAY,  MyFrame::OnSetTooltipDelay)


@@ -1009,6 +1022,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(TEXT_PAGE_DOWN,          MyFrame::OnScrollPageDown)
     EVT_MENU(TEXT_PAGE_UP,            MyFrame::OnScrollPageUp)
 
     EVT_MENU(TEXT_PAGE_DOWN,          MyFrame::OnScrollPageDown)
     EVT_MENU(TEXT_PAGE_UP,            MyFrame::OnScrollPageUp)
 

+    EVT_MENU(TEXT_SET,                MyFrame::OnSetText)
+

     EVT_IDLE(MyFrame::OnIdle)
 END_EVENT_TABLE()
 
     EVT_IDLE(MyFrame::OnIdle)
 END_EVENT_TABLE()