Split up the context menu functionality to make it easier to customise.

Tweaked style combobox popup border.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/richtext/richtextctrl.h

@@ -1564,6 +1564,17 @@ public:
     */
     bool ApplyStyleSheet(wxRichTextStyleSheet* styleSheet = NULL);
 
+    /**
+        Shows the given context menu, optionally adding appropriate property-editing commands for the current position in the object hierarchy.
+    */
+    virtual bool ShowContextMenu(wxMenu* menu, const wxPoint& pt, bool addPropertyCommands = true);
+
+    /**
+        Prepares the context menu, optionally adding appropriate property-editing commands.
+        Returns the number of property commands added.
+    */
+    virtual int PrepareContextMenu(wxMenu* menu, const wxPoint& pt, bool addPropertyCommands = true);
+
 // Command handlers
 
     /**

interface/wx/richtext/richtextctrl.h

@@ -1537,6 +1537,17 @@ public:
     */
     bool ApplyStyleSheet(wxRichTextStyleSheet* styleSheet = NULL);
 
+    /**
+        Shows the given context menu, optionally adding appropriate property-editing commands for the current position in the object hierarchy.
+    */
+    virtual bool ShowContextMenu(wxMenu* menu, const wxPoint& pt, bool addPropertyCommands);
+
+    /**
+        Prepares the context menu, optionally adding appropriate property-editing commands.
+        Returns the number of property commands added.
+    */
+    virtual int PrepareContextMenu(wxMenu* menu, const wxPoint& pt, bool addPropertyCommands);
+
 // Command handlers
 
     /**

src/richtext/richtextctrl.cpp

@@ -3200,18 +3200,26 @@ void wxRichTextCtrl::OnContextMenu(wxContextMenuEvent& event)
         return;
     }
 
+    ShowContextMenu(m_contextMenu, event.GetPosition());
+}
+
+// Prepares the context menu, adding appropriate property-editing commands.
+// Returns the number of property commands added.
+int wxRichTextCtrl::PrepareContextMenu(wxMenu* menu, const wxPoint& pt, bool addPropertyCommands)
+{
     wxClientDC dc(this);
     PrepareDC(dc);
     dc.SetFont(GetFont());
 
+    m_contextMenuPropertiesInfo.Clear();
+
     long position = 0;
-    wxPoint pt = event.GetPosition();
-    wxPoint logicalPt = GetLogicalPoint(ScreenToClient(pt));
     wxRichTextObject* hitObj = NULL;
     wxRichTextObject* contextObj = NULL;
-    int hit = GetFocusObject()->HitTest(dc, logicalPt, position, & hitObj, & contextObj);
+    if (pt != wxDefaultPosition)
-
+    {
-    m_contextMenuPropertiesInfo.Clear();
+        wxPoint logicalPt = GetLogicalPoint(ScreenToClient(pt));
+        int hit = GetBuffer().HitTest(dc, logicalPt, position, & hitObj, & contextObj);
 
         if (hit == wxRICHTEXT_HITTEST_ON || hit == wxRICHTEXT_HITTEST_BEFORE || hit == wxRICHTEXT_HITTEST_AFTER)
         {
@@ -3224,21 +3232,65 @@ void wxRichTextCtrl::OnContextMenu(wxContextMenuEvent& event)
                     SetCaretPositionAfterClick(actualContainer, position, hit);
                 }
 
+                if (addPropertyCommands)
                     m_contextMenuPropertiesInfo.AddItems(actualContainer, hitObj);
             }
             else
+            {
+                if (addPropertyCommands)
                     m_contextMenuPropertiesInfo.AddItems(GetFocusObject(), NULL);
             }
+        }
         else
         {
+            if (addPropertyCommands)
                 m_contextMenuPropertiesInfo.AddItems(GetFocusObject(), NULL);
         }
-
-    if (m_contextMenu)
-    {
-        m_contextMenuPropertiesInfo.AddMenuItems(m_contextMenu);
-        PopupMenu(m_contextMenu);
     }
+    else
+    {
+        // Invoked from the keyboard, so don't set the caret position and don't use the event
+        // position
+        hitObj = GetFocusObject()->GetLeafObjectAtPosition(m_caretPosition+1);
+        if (hitObj)
+            contextObj = hitObj->GetParentContainer();
+        else
+            contextObj = GetFocusObject();
+
+        wxRichTextParagraphLayoutBox* actualContainer = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox);
+        if (hitObj && actualContainer)
+        {
+            if (addPropertyCommands)
+                m_contextMenuPropertiesInfo.AddItems(actualContainer, hitObj);
+        }
+        else
+        {
+            if (addPropertyCommands)
+                m_contextMenuPropertiesInfo.AddItems(GetFocusObject(), NULL);
+        }
+    }
+
+    if (menu)
+    {
+        if (addPropertyCommands)
+            m_contextMenuPropertiesInfo.AddMenuItems(menu);
+        return m_contextMenuPropertiesInfo.GetCount();
+    }
+    else
+        return 0;
+}
+
+// Shows the context menu, adding appropriate property-editing commands
+bool wxRichTextCtrl::ShowContextMenu(wxMenu* menu, const wxPoint& pt, bool addPropertyCommands)
+{
+    if (menu)
+    {
+        PrepareContextMenu(menu, pt, addPropertyCommands);
+        PopupMenu(menu);
+        return true;
+    }
+    else
+        return false;
 }
 
 bool wxRichTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
@@ -4279,12 +4331,11 @@ bool wxRichTextContextMenuPropertiesInfo::AddItem(const wxString& label, wxRichT
 int wxRichTextContextMenuPropertiesInfo::AddMenuItems(wxMenu* menu, int startCmd) const
 {
     wxMenuItem* item = menu->FindItem(startCmd);
-    // If none of the standard properties identifiers are in the menu, assume it's
+    // If none of the standard properties identifiers are in the menu, add them if necessary.
-    // a custom menu without properties commands, and don't add them.
+    // If no items to add, just set the text to something generic
-    if (item)
-    {
-        // If no items, to add just set the text to something generic
     if (GetCount() == 0)
+    {
+        if (item)
         {
             menu->SetLabel(startCmd, _("&Properties"));
 
@@ -4298,6 +4349,7 @@ int wxRichTextContextMenuPropertiesInfo::AddMenuItems(wxMenu* menu, int startCmd
                 }
             }
         }
+    }
     else
     {
         int i;
@@ -4341,6 +4393,14 @@ int wxRichTextContextMenuPropertiesInfo::AddMenuItems(wxMenu* menu, int startCmd
                 }
             }
         }
+        else
+        {
+            // No existing property identifiers were found, so append to the end of the menu.
+            menu->AppendSeparator();
+            for (i = startCmd; i < startCmd+GetCount(); i++)
+            {
+                menu->Append(i, m_labels[i - startCmd]);
+            }
         }
     }
 

src/richtext/richtextstyles.cpp

@@ -1209,8 +1209,8 @@ END_EVENT_TABLE()
 bool wxRichTextStyleComboPopup::Create( wxWindow* parent )
 {
     int borderStyle = GetDefaultBorder();
-    if (borderStyle == wxBORDER_SUNKEN)
+    if (borderStyle == wxBORDER_SUNKEN || borderStyle == wxBORDER_NONE)
-        borderStyle = wxBORDER_SIMPLE;
+        borderStyle = wxBORDER_THEME;
 
     return wxRichTextStyleListBox::Create(parent, wxID_ANY,
                                   wxPoint(0,0), wxDefaultSize,