X property data is long for format 32

[wxWidgets.git] / src / richtext / richtextctrl.cpp

diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index b23a95f9495f24eb04ec94717565eb691b325297..caf9d338d8e22ded01711e4444966ed49be9c582 100644 (file)
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -129,14 +129,6 @@ wxRichTextCtrl::wxRichTextCtrl(wxWindow* parent,
 bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, long style,
                              const wxValidator& validator, const wxString& name)
 {
-       // Try to make this only necessary in 2.8
-#if 0
-#ifdef __WXMSW__
-       if ((style & wxBORDER_MASK) == wxDEFAULT)
-               style |= wxBORDER_THEME;
-#endif
-#endif
-
     if (!wxTextCtrlBase::Create(parent, id, pos, size,
                                 style|wxFULL_REPAINT_ON_RESIZE,
                                 validator, name))
@@ -2535,8 +2527,14 @@ void wxRichTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent& event)
     event.Enable(GetLastPosition() > 0);
 }
 
-void wxRichTextCtrl::OnContextMenu(wxContextMenuEvent& WXUNUSED(event))
+void wxRichTextCtrl::OnContextMenu(wxContextMenuEvent& event)
 {
+    if (event.GetEventObject() != this)
+    {
+        event.Skip();
+        return;
+    }
+
     if (!m_contextMenu)
     {
         m_contextMenu = new wxMenu;