Applied colspan corrections, #15274 and #15275 (dghart)

[wxWidgets.git] / src / aui / tabart.cpp

diff --git a/src/aui/tabart.cpp b/src/aui/tabart.cpp
index 62c6c5f9ddfa46ccb9678d64e94872dcf66ab7b5..35026065ec81fd6c97f7c8d99b0bc90a056b754c 100644 (file)
--- a/src/aui/tabart.cpp
+++ b/src/aui/tabart.cpp
@@ -50,7 +50,7 @@ public:
 
     bool ProcessEvent(wxEvent& evt)
     {
-        if (evt.GetEventType() == wxEVT_COMMAND_MENU_SELECTED)
+        if (evt.GetEventType() == wxEVT_MENU)
         {
             m_lastId = evt.GetId();
             return true;
@@ -610,6 +610,11 @@ int wxAuiGenericTabArt::GetBorderWidth(wxWindow* wnd)
     return 1;
 }
 
+int wxAuiGenericTabArt::GetAdditionalBorderSpace(wxWindow* WXUNUSED(wnd))
+{
+    return 0;
+}
+
 wxSize wxAuiGenericTabArt::GetTabSize(wxDC& dc,
                                       wxWindow* WXUNUSED(wnd),
                                       const wxString& caption,
@@ -1137,6 +1142,11 @@ int wxAuiSimpleTabArt::GetBorderWidth(wxWindow* wnd)
     return 1;
 }
 
+int wxAuiSimpleTabArt::GetAdditionalBorderSpace(wxWindow* WXUNUSED(wnd))
+{
+    return 0;
+}
+
 wxSize wxAuiSimpleTabArt::GetTabSize(wxDC& dc,
                                      wxWindow* WXUNUSED(wnd),
                                      const wxString& caption,