X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cba1148d002eb95bc9b7da12baa5bd5b77ac66a2..830efc9b0cb87eae22d4435af7858175017522ab:/samples/text/text.cpp?ds=sidebyside

diff --git a/samples/text/text.cpp b/samples/text/text.cpp
index f805cbf505..5f4ba2899c 100644
--- a/samples/text/text.cpp
+++ b/samples/text/text.cpp
@@ -36,6 +36,8 @@
     #include "wx/tooltip.h"
 #endif
 
+    #include "wx/progdlg.h"
+
 // We test for wxUSE_DRAG_AND_DROP also, because data objects may not be
 // implemented for compilers that can't cope with the OLE parts in
 // wxUSE_DRAG_AND_DROP.
@@ -76,14 +78,18 @@ public:
 
     void OnMouseEvent(wxMouseEvent& event);
 
+    void OnSetFocus(wxFocusEvent& event);
+    void OnKillFocus(wxFocusEvent& event);
+
     static bool ms_logKey;
     static bool ms_logChar;
     static bool ms_logMouse;
     static bool ms_logText;
+    static bool ms_logFocus;
 
 private:
     static inline wxChar GetChar(bool on, wxChar c) { return on ? c : _T('-'); }
-    void LogEvent(const wxChar *name, wxKeyEvent& event) const;
+    void LogKeyEvent(const wxChar *name, wxKeyEvent& event) const;
 
     bool m_hasCapture;
 
@@ -94,6 +100,7 @@ class MyPanel: public wxPanel
 {
 public:
     MyPanel(wxFrame *frame, int x, int y, int w, int h);
+    virtual ~MyPanel() { delete wxLog::SetActiveTarget(m_logOld); }
 
 #if wxUSE_CLIPBOARD
     void DoPasteFromClipboard();
@@ -120,6 +127,8 @@ public:
 
     wxTextCtrl    *m_log;
 
+    wxLog         *m_logOld;
+
 private:
     // get the currently focused text control or return the default one is no
     // text ctrl has focus
@@ -210,6 +219,16 @@ public:
         MyTextCtrl::ms_logText = event.IsChecked();
     }
 
+    void OnLogFocus(wxCommandEvent& event)
+    {
+        MyTextCtrl::ms_logFocus = event.IsChecked();
+    }
+
+    void OnSetText(wxCommandEvent& event)
+    {
+        m_panel->m_text->SetValue(_T("Hello, world (what else did you expect)?"));
+    }
+
     void OnIdle( wxIdleEvent& event );
 
 private:
@@ -219,8 +238,14 @@ private:
         if ( freeze )
             text->Freeze();
 
+        text->Clear();
+
+        wxProgressDialog dlg(_T("Wait..."), _T("Updating"), 100, this);
         for ( int i = 0; i < 100; i++ )
+        {
+            dlg.Update(i);
             text->AppendText(wxString::Format(wxT("Line %i\n"), i));
+        }
 
         text->SetInsertionPoint(0);
 
@@ -271,12 +296,14 @@ enum
     TEXT_PAGE_DOWN,
     TEXT_PAGE_UP,
     TEXT_REMOVE,
+    TEXT_SET,
 
     // log menu
     TEXT_LOG_KEY,
     TEXT_LOG_CHAR,
     TEXT_LOG_MOUSE,
     TEXT_LOG_TEXT,
+    TEXT_LOG_FOCUS,
 
     TEXT_END
 };
@@ -324,6 +351,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_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");
@@ -343,12 +371,24 @@ bool MyApp::OnInit()
     menuLog->Append(TEXT_LOG_CHAR, "Log &char events", "", TRUE);
     menuLog->Append(TEXT_LOG_MOUSE, "Log &mouse events", "", TRUE);
     menuLog->Append(TEXT_LOG_TEXT, "Log &text events", "", TRUE);
+    menuLog->Append(TEXT_LOG_FOCUS, "Log &focus events", "", TRUE);
     menuLog->AppendSeparator();
     menuLog->Append(TEXT_CLEAR, "&Clear the log\tCtrl-C",
                     "Clear the log window contents");
+
+    // select only the interesting events by default
+#if 0
     menuLog->Check(TEXT_LOG_KEY, TRUE);
     menuLog->Check(TEXT_LOG_CHAR, TRUE);
     menuLog->Check(TEXT_LOG_TEXT, TRUE);
+
+    MyTextCtrl::ms_logKey =
+    MyTextCtrl::ms_logChar =
+    MyTextCtrl::ms_logText = TRUE;
+#else
+    menuLog->Check(TEXT_LOG_FOCUS, TRUE);
+    MyTextCtrl::ms_logFocus = TRUE;
+#endif
     menu_bar->Append(menuLog, "&Log");
 
     frame->SetMenuBar(menu_bar);
@@ -375,14 +415,18 @@ BEGIN_EVENT_TABLE(MyTextCtrl, wxTextCtrl)
     EVT_TEXT_MAXLEN(-1, MyTextCtrl::OnTextMaxLen)
 
     EVT_MOUSE_EVENTS(MyTextCtrl::OnMouseEvent)
+
+    EVT_SET_FOCUS(MyTextCtrl::OnSetFocus)
+    EVT_KILL_FOCUS(MyTextCtrl::OnKillFocus)
 END_EVENT_TABLE()
 
-bool MyTextCtrl::ms_logKey = TRUE;
-bool MyTextCtrl::ms_logChar = TRUE;
+bool MyTextCtrl::ms_logKey = FALSE;
+bool MyTextCtrl::ms_logChar = FALSE;
 bool MyTextCtrl::ms_logMouse = FALSE;
-bool MyTextCtrl::ms_logText = TRUE;
+bool MyTextCtrl::ms_logText = FALSE;
+bool MyTextCtrl::ms_logFocus = FALSE;
 
-void MyTextCtrl::LogEvent(const wxChar *name, wxKeyEvent& event) const
+void MyTextCtrl::LogKeyEvent(const wxChar *name, wxKeyEvent& event) const
 {
     wxString key;
     long keycode = event.KeyCode();
@@ -584,6 +628,22 @@ void MyTextCtrl::OnMouseEvent(wxMouseEvent& ev)
     //else: we're not interested in mouse move events
 }
 
+void MyTextCtrl::OnSetFocus(wxFocusEvent& event)
+{
+    if ( ms_logFocus )
+        wxLogMessage("%p got focus.", this);
+
+    event.Skip();
+}
+
+void MyTextCtrl::OnKillFocus(wxFocusEvent& event)
+{
+    if ( ms_logFocus )
+        wxLogMessage("%p lost focus", this);
+
+    event.Skip();
+}
+
 void MyTextCtrl::OnText(wxCommandEvent& event)
 {
     if ( !ms_logText )
@@ -625,7 +685,7 @@ void MyTextCtrl::OnTextURL(wxTextUrlEvent& event)
 void MyTextCtrl::OnChar(wxKeyEvent& event)
 {
     if ( ms_logChar )
-        LogEvent( _T("Char"), event);
+        LogKeyEvent( _T("Char"), event);
 
     event.Skip();
 }
@@ -633,7 +693,7 @@ void MyTextCtrl::OnChar(wxKeyEvent& event)
 void MyTextCtrl::OnKeyUp(wxKeyEvent& event)
 {
     if ( ms_logKey )
-        LogEvent( _T("Key up"), event);
+        LogKeyEvent( _T("Key up"), event);
 
     event.Skip();
 }
@@ -678,7 +738,7 @@ void MyTextCtrl::OnKeyDown(wxKeyEvent& event)
             else
             {
                 wxLogDebug( wxT("Stopped capturing mouse and events.") );
-                m_hasCapture = TRUE;
+                m_hasCapture = FALSE;
                 ReleaseMouse();
             }
             break;
@@ -710,7 +770,7 @@ void MyTextCtrl::OnKeyDown(wxKeyEvent& event)
     }
 
     if ( ms_logKey )
-        LogEvent( wxT("Key down"), event);
+        LogKeyEvent( wxT("Key down"), event);
 
     event.Skip();
 }
@@ -726,11 +786,11 @@ END_EVENT_TABLE()
 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 ) );
-
-    delete old_log;
+    m_logOld = wxLog::SetActiveTarget( new wxLogTextCtrl( m_log ) );
 
     // single line text controls
 
@@ -770,11 +830,22 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
                 m_horizontal->SetValue("®lu»ouèký kùò zbìsile èe¹tina «»");
                 break;
 
-            default:
+            case '1':
                 m_horizontal->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxNORMAL,
                                              FALSE, "",
-                                             wxFONTENCODING_KOI8));
+                                             wxFONTENCODING_CP1251));
+                m_horizontal->SetValue("Ïðèâåò!");
+                break;
+
+            case '8':
+                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("ËÁÖÅÔÓÑ ÕÄÁÞÎÙÍ");
+#endif
         }
     }
     else
@@ -811,10 +882,9 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
                                 wxPoint(450, 10), wxSize(230, 230),
                                 wxTE_RICH |
                                 wxTE_MULTILINE |
-                                wxTE_AUTO_URL |
+                                // wxTE_AUTO_URL |
                                 wxHSCROLL);
 
-#if 1
     m_textrich->SetStyle(0, 10, *wxRED);
     m_textrich->SetStyle(10, 20, *wxBLUE);
     m_textrich->SetStyle(30, 40,
@@ -826,19 +896,9 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     m_textrich->AppendText(_T("And the next 10 characters should be green and italic\n"));
     m_textrich->SetDefaultStyle(wxTextAttr(*wxCYAN, *wxBLUE));
     m_textrich->AppendText(_T("This text should be cyan on blue\n"));
-    m_textrich->SetDefaultStyle(*wxBLUE);
+    m_textrich->SetDefaultStyle(wxTextAttr(*wxBLUE, *wxWHITE));
     m_textrich->AppendText(_T("And this should be in blue and the text you ")
                            _T("type should be in blue as well"));
-#else
-    m_textrich->SetFont(wxFont(12, wxFONTFAMILY_TELETYPE,
-                               wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL));
-    m_textrich->SetDefaultStyle(wxTextAttr(*wxRED));
-    m_textrich->AppendText(_T("Red text\n"));
-    m_textrich->SetDefaultStyle(wxTextAttr(wxNullColour, *wxLIGHT_GREY));
-    m_textrich->AppendText(_T("Red on grey text\n"));
-    m_textrich->SetDefaultStyle(wxTextAttr(*wxBLUE));
-    m_textrich->AppendText(_T("Blue on grey text\n"));
-#endif
 }
 
 void MyPanel::OnSize( wxSizeEvent &event )
@@ -976,7 +1036,8 @@ 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_CLEAR,  MyFrame::OnLogClear)
+    EVT_MENU(TEXT_LOG_FOCUS,MyFrame::OnLogFocus)
+    EVT_MENU(TEXT_CLEAR,    MyFrame::OnLogClear)
 
 #if wxUSE_TOOLTIPS
     EVT_MENU(TEXT_TOOLTIPS_SETDELAY,  MyFrame::OnSetTooltipDelay)
@@ -1002,6 +1063,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     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()