Dtor for wxHtmlCell

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

diff --git a/samples/text/text.cpp b/samples/text/text.cpp
index 9229c801ec6f8adbbaecdf40a7b10341aea797db..4ff4b2d62346f1fc65b6583420802b47fdfe14fc 100644 (file)
--- a/samples/text/text.cpp
+++ b/samples/text/text.cpp
@@ -71,6 +71,7 @@ public:
     void OnChar(wxKeyEvent& event);
 
     void OnText(wxCommandEvent& event);
     void OnChar(wxKeyEvent& event);
 
     void OnText(wxCommandEvent& event);

+    void OnTextEnter(wxCommandEvent& event);

     void OnTextURL(wxTextUrlEvent& event);
     void OnTextMaxLen(wxCommandEvent& event);
 
     void OnTextURL(wxTextUrlEvent& event);
     void OnTextMaxLen(wxCommandEvent& event);
 


@@ -116,6 +117,14 @@ public:
     void DoMoveToEndOfText();
     void DoMoveToEndOfEntry();
 
     void DoMoveToEndOfText();
     void DoMoveToEndOfEntry();
 

+    // return true if currently text control has any selection
+    bool HasSelection() const
+    {
+        long from, to;
+        GetFocusedText()->GetSelection(&from, &to);
+        return from != to;
+    }
+

     MyTextCtrl    *m_text;
     MyTextCtrl    *m_password;
     MyTextCtrl    *m_enter;
     MyTextCtrl    *m_text;
     MyTextCtrl    *m_password;
     MyTextCtrl    *m_enter;


@@ -134,9 +143,10 @@ public:
 #endif // wxUSE_LOG
 
 private:
 #endif // wxUSE_LOG
 
 private:

-    // get the currently focused text control or return the default one is no
-    // text ctrl has focus
-    wxTextCtrl *GetFocusedText(wxTextCtrl *textDef);
+    // get the currently focused text control or return the default one
+    // (m_multitext) is no text ctrl has focus -- in any case, returns
+    // something non NULL
+    wxTextCtrl *GetFocusedText() const;

 };
 
 class MyFrame: public wxFrame
 };
 
 class MyFrame: public wxFrame


@@ -153,9 +163,27 @@ public:
 
 #if wxUSE_CLIPBOARD
     void OnPasteFromClipboard( wxCommandEvent& WXUNUSED(event) )
 
 #if wxUSE_CLIPBOARD
     void OnPasteFromClipboard( wxCommandEvent& WXUNUSED(event) )

-        { m_panel->DoPasteFromClipboard(); }
+    {
+        wxLogMessage(_T("Pasting text from clipboard."));
+        m_panel->DoPasteFromClipboard();
+    }

     void OnCopyToClipboard( wxCommandEvent& WXUNUSED(event) )
     void OnCopyToClipboard( wxCommandEvent& WXUNUSED(event) )

-        { m_panel->DoCopyToClipboard(); }
+    {
+        wxLogMessage(_T("Copying text to clipboard."));
+        m_panel->DoCopyToClipboard();
+    }
+
+    void OnUpdatePasteFromClipboard(wxUpdateUIEvent& event)
+    {
+        wxClipboardLocker lockClip;
+
+        event.Enable( wxTheClipboard->IsSupported(wxDF_TEXT) );
+    }
+
+    void OnUpdateCopyToClipboard(wxUpdateUIEvent& event)
+    {
+        event.Enable( m_panel->HasSelection() );
+    }

 #endif // wxUSE_CLIPBOARD
 
     void OnAddTextFreeze( wxCommandEvent& WXUNUSED(event) )
 #endif // wxUSE_CLIPBOARD
 
     void OnAddTextFreeze( wxCommandEvent& WXUNUSED(event) )


@@ -328,9 +356,9 @@ IMPLEMENT_APP(MyApp)
 
 enum
 {
 
 enum
 {

-    TEXT_QUIT = 100,
-    TEXT_ABOUT,
-    TEXT_LOAD,
+    TEXT_QUIT = wxID_EXIT,
+    TEXT_ABOUT = wxID_ABOUT,
+    TEXT_LOAD = 101,

     TEXT_SAVE,
     TEXT_CLEAR,
     TEXT_RICH_TEXT_TEST,
     TEXT_SAVE,
     TEXT_CLEAR,
     TEXT_RICH_TEXT_TEST,


@@ -406,10 +434,12 @@ bool MyApp::OnInit()
 #endif // wxUSE_TOOLTIPS
 
 #if wxUSE_CLIPBOARD
 #endif // wxUSE_TOOLTIPS
 
 #if wxUSE_CLIPBOARD

+    // notice that we use non default accelerators on purpose here to compare
+    // their behaviour with the built in handling of standard Ctrl/Cmd-C/V

     wxMenu *menuClipboard = new wxMenu;
     wxMenu *menuClipboard = new wxMenu;

-    menuClipboard->Append(TEXT_CLIPBOARD_COPY, _T("&Copy\tCtrl-C"),
-                          _T("Copy the first line to the clipboard"));
-    menuClipboard->Append(TEXT_CLIPBOARD_PASTE, _T("&Paste\tCtrl-V"),
+    menuClipboard->Append(TEXT_CLIPBOARD_COPY, _T("&Copy\tCtrl-Shift-C"),
+                          _T("Copy the selection to the clipboard"));
+    menuClipboard->Append(TEXT_CLIPBOARD_PASTE, _T("&Paste\tCtrl-Shift-V"),

                           _T("Paste from clipboard to the text control"));
     menu_bar->Append(menuClipboard, _T("&Clipboard"));
 #endif // wxUSE_CLIPBOARD
                           _T("Paste from clipboard to the text control"));
     menu_bar->Append(menuClipboard, _T("&Clipboard"));
 #endif // wxUSE_CLIPBOARD


@@ -481,6 +511,7 @@ BEGIN_EVENT_TABLE(MyTextCtrl, wxTextCtrl)
     EVT_CHAR(MyTextCtrl::OnChar)
 
     EVT_TEXT(wxID_ANY, MyTextCtrl::OnText)
     EVT_CHAR(MyTextCtrl::OnChar)
 
     EVT_TEXT(wxID_ANY, MyTextCtrl::OnText)

+    EVT_TEXT_ENTER(wxID_ANY, MyTextCtrl::OnTextEnter)

     EVT_TEXT_URL(wxID_ANY, MyTextCtrl::OnTextURL)
     EVT_TEXT_MAXLEN(wxID_ANY, MyTextCtrl::OnTextMaxLen)
 
     EVT_TEXT_URL(wxID_ANY, MyTextCtrl::OnTextURL)
     EVT_TEXT_MAXLEN(wxID_ANY, MyTextCtrl::OnTextMaxLen)
 


@@ -745,6 +776,23 @@ void MyTextCtrl::OnText(wxCommandEvent& event)
     }
 }
 
     }
 }
 

+void MyTextCtrl::OnTextEnter(wxCommandEvent& event)
+{
+    if ( !ms_logText )
+        return;
+
+    MyTextCtrl *win = (MyTextCtrl *)event.GetEventObject();
+    const wxChar *data = (const wxChar *)(win->GetClientData());
+    if ( data )
+    {
+        wxLogMessage(_T("Enter pressed in control '%s'"), data);
+    }
+    else
+    {
+        wxLogMessage(_T("Enter pressed in some control"));
+    }
+}
+

 void MyTextCtrl::OnTextMaxLen(wxCommandEvent& WXUNUSED(event))
 {
     wxLogMessage(_T("You can't enter more characters into this control."));
 void MyTextCtrl::OnTextMaxLen(wxCommandEvent& WXUNUSED(event))
 {
     wxLogMessage(_T("You can't enter more characters into this control."));


@@ -925,14 +973,14 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
                 m_horizontal->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxNORMAL,
                                              false, _T(""),
                                              wxFONTENCODING_ISO8859_2));
                 m_horizontal->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxNORMAL,
                                              false, _T(""),
                                              wxFONTENCODING_ISO8859_2));

-                m_horizontal->AppendText(_T("®lu»ouèký kùò zbìsile èe¹tina «»"));
+                m_horizontal->AppendText(_T("\256lu\273ou\350k\375 k\371\362 zb\354sile \350e\271tina \253\273"));

                 break;
 
             case '1':
                 m_horizontal->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxNORMAL,
                                              false, _T(""),
                                              wxFONTENCODING_CP1251));
                 break;
 
             case '1':
                 m_horizontal->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxNORMAL,
                                              false, _T(""),
                                              wxFONTENCODING_CP1251));

-                m_horizontal->AppendText(_T("Ïðèâåò!"));
+                m_horizontal->AppendText(_T("\317\360\350\342\345\362!"));

                 break;
 
             case '8':
                 break;
 
             case '8':


@@ -942,7 +990,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 #if wxUSE_UNICODE
                 m_horizontal->AppendText(L"\x0412\x0430\x0434\x0438\x043c \x0426");
 #else
 #if wxUSE_UNICODE
                 m_horizontal->AppendText(L"\x0412\x0430\x0434\x0438\x043c \x0426");
 #else

-                m_horizontal->AppendText("ËÁÖÅÔÓÑ ÕÄÁÞÎÙÍ");
+                m_horizontal->AppendText("\313\301\326\305\324\323\321 \325\304\301\336\316\331\315");

 #endif
         }
     }
 #endif
         }
     }


@@ -1026,12 +1074,12 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     SetSizer(topSizer);
 }
 
     SetSizer(topSizer);
 }
 

-wxTextCtrl *MyPanel::GetFocusedText(wxTextCtrl *textDef)
+wxTextCtrl *MyPanel::GetFocusedText() const

 {
     wxWindow *win = FindFocus();
 
     wxTextCtrl *text = win ? wxDynamicCast(win, wxTextCtrl) : NULL;
 {
     wxWindow *win = FindFocus();
 
     wxTextCtrl *text = win ? wxDynamicCast(win, wxTextCtrl) : NULL;

-    return text ? text : textDef;
+    return text ? text : m_multitext;

 }
 
 #if wxUSE_CLIPBOARD
 }
 
 #if wxUSE_CLIPBOARD


@@ -1069,7 +1117,7 @@ void MyPanel::DoPasteFromClipboard()
 #if wxUSE_LOG
             *m_log << _T("Successfully retrieved data from the clipboard.\n");
 #endif // wxUSE_LOG
 #if wxUSE_LOG
             *m_log << _T("Successfully retrieved data from the clipboard.\n");
 #endif // wxUSE_LOG

-            *m_multitext << data.GetText() << _T("\n");
+            GetFocusedText()->AppendText(data.GetText());

         }
         else
         {
         }
         else
         {


@@ -1099,7 +1147,7 @@ void MyPanel::DoCopyToClipboard()
     // call has no effect under MSW.
     wxTheClipboard->UsePrimarySelection();
 
     // call has no effect under MSW.
     wxTheClipboard->UsePrimarySelection();
 

-    wxString text( m_multitext->GetLineText(0) );
+    wxString text( GetFocusedText()->GetStringSelection() );

 
     if (text.IsEmpty())
     {
 
     if (text.IsEmpty())
     {


@@ -1163,17 +1211,17 @@ void MyPanel::DoMoveToEndOfEntry()
 
 void MyPanel::DoRemoveText()
 {
 
 void MyPanel::DoRemoveText()
 {

-    GetFocusedText(m_multitext)->Remove(0, 10);
+    GetFocusedText()->Remove(0, 10);

 }
 
 void MyPanel::DoReplaceText()
 {
 }
 
 void MyPanel::DoReplaceText()
 {

-    GetFocusedText(m_multitext)->Replace(3, 8, _T("ABC"));
+    GetFocusedText()->Replace(3, 8, _T("ABC"));

 }
 
 void MyPanel::DoSelectText()
 {
 }
 
 void MyPanel::DoSelectText()
 {

-    GetFocusedText(m_multitext)->SetSelection(3, 8);
+    GetFocusedText()->SetSelection(3, 8);

 }
 
 //----------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------


@@ -1204,6 +1252,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 #if wxUSE_CLIPBOARD
     EVT_MENU(TEXT_CLIPBOARD_PASTE,    MyFrame::OnPasteFromClipboard)
     EVT_MENU(TEXT_CLIPBOARD_COPY,     MyFrame::OnCopyToClipboard)
 #if wxUSE_CLIPBOARD
     EVT_MENU(TEXT_CLIPBOARD_PASTE,    MyFrame::OnPasteFromClipboard)
     EVT_MENU(TEXT_CLIPBOARD_COPY,     MyFrame::OnCopyToClipboard)

+
+    EVT_UPDATE_UI(TEXT_CLIPBOARD_PASTE, MyFrame::OnUpdatePasteFromClipboard)
+    EVT_UPDATE_UI(TEXT_CLIPBOARD_COPY,  MyFrame::OnUpdateCopyToClipboard)

 #endif // wxUSE_CLIPBOARD
 
     EVT_MENU(TEXT_REMOVE,             MyFrame::OnRemoveText)
 #endif // wxUSE_CLIPBOARD
 
     EVT_MENU(TEXT_REMOVE,             MyFrame::OnRemoveText)