Return NULL from wxWindow::GetCapture() when the capture is being lost.

[wxWidgets.git] / src / common / headerctrlcmn.cpp

diff --git a/src/common/headerctrlcmn.cpp b/src/common/headerctrlcmn.cpp
index 991dc7b710518dbe455c342a689db71db917c432..2dfbcc6bc72d4bf0190a3552cb54ba6ae828fd18 100644 (file)
--- a/src/common/headerctrlcmn.cpp
+++ b/src/common/headerctrlcmn.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implementation of wxHeaderCtrlBase
 // Author:      Vadim Zeitlin
 // Created:     2008-12-02
 // Purpose:     implementation of wxHeaderCtrlBase
 // Author:      Vadim Zeitlin
 // Created:     2008-12-02

-// RCS-ID:      $Id$

 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -23,12 +22,15 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_HEADERCTRL
+

 #ifndef WX_PRECOMP
     #include "wx/menu.h"
 #endif // WX_PRECOMP
 
 #include "wx/headerctrl.h"
 #include "wx/rearrangectrl.h"
 #ifndef WX_PRECOMP
     #include "wx/menu.h"
 #endif // WX_PRECOMP
 
 #include "wx/headerctrl.h"
 #include "wx/rearrangectrl.h"

+#include "wx/renderer.h"

 
 namespace
 {
 
 namespace
 {


@@ -43,6 +45,8 @@ const unsigned int wxNO_COLUMN = static_cast<unsigned>(-1);
 // wxHeaderColumnsRearrangeDialog: dialog for customizing our columns
 // ----------------------------------------------------------------------------
 
 // wxHeaderColumnsRearrangeDialog: dialog for customizing our columns
 // ----------------------------------------------------------------------------
 

+#if wxUSE_REARRANGECTRL
+

 class wxHeaderColumnsRearrangeDialog : public wxRearrangeDialog
 {
 public:
 class wxHeaderColumnsRearrangeDialog : public wxRearrangeDialog
 {
 public:


@@ -61,6 +65,8 @@ public:
     }
 };
 
     }
 };
 

+#endif // wxUSE_REARRANGECTRL
+

 } // anonymous namespace
 
 // ============================================================================
 } // anonymous namespace
 
 // ============================================================================


@@ -71,9 +77,9 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxHeaderCtrlNameStr[] = "wxHeaderCtrl";
 
 BEGIN_EVENT_TABLE(wxHeaderCtrlBase, wxControl)
     EVT_HEADER_SEPARATOR_DCLICK(wxID_ANY, wxHeaderCtrlBase::OnSeparatorDClick)
 
 BEGIN_EVENT_TABLE(wxHeaderCtrlBase, wxControl)
     EVT_HEADER_SEPARATOR_DCLICK(wxID_ANY, wxHeaderCtrlBase::OnSeparatorDClick)

-#if wxUSE_MENU
+#if wxUSE_MENUS

     EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxHeaderCtrlBase::OnRClick)
     EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxHeaderCtrlBase::OnRClick)

-#endif // wxUSE_MENU
+#endif // wxUSE_MENUS

 END_EVENT_TABLE()
 
 void wxHeaderCtrlBase::ScrollWindow(int dx,
 END_EVENT_TABLE()
 
 void wxHeaderCtrlBase::ScrollWindow(int dx,


@@ -101,6 +107,21 @@ void wxHeaderCtrlBase::SetColumnCount(unsigned int count)
     DoSetCount(count);
 }
 
     DoSetCount(count);
 }
 

+int wxHeaderCtrlBase::GetColumnTitleWidth(const wxHeaderColumn& col)
+{
+    int w = wxWindowBase::GetTextExtent(col.GetTitle()).x;
+
+    // add some margin:
+    w += wxRendererNative::Get().GetHeaderButtonMargin(this);
+
+    // if a bitmap is used, add space for it and 2px border:
+    wxBitmap bmp = col.GetBitmap();
+    if ( bmp.IsOk() )
+        w += bmp.GetWidth() + 2;
+
+    return w;
+}
+

 // ----------------------------------------------------------------------------
 // wxHeaderCtrlBase event handling
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxHeaderCtrlBase event handling
 // ----------------------------------------------------------------------------


@@ -108,9 +129,15 @@ void wxHeaderCtrlBase::SetColumnCount(unsigned int count)
 void wxHeaderCtrlBase::OnSeparatorDClick(wxHeaderCtrlEvent& event)
 {
     const unsigned col = event.GetColumn();
 void wxHeaderCtrlBase::OnSeparatorDClick(wxHeaderCtrlEvent& event)
 {
     const unsigned col = event.GetColumn();

+    const wxHeaderColumn& column = GetColumn(col);
+
+    if ( !column.IsResizeable() )
+    {
+        event.Skip();
+        return;
+    }

 
 

-    int w = wxWindowBase::GetTextExtent(GetColumn(col).GetTitle()).x;
-    w += 4*GetCharWidth(); // add some arbitrary margins around text
+    int w = GetColumnTitleWidth(column);

 
     if ( !UpdateColumnWidthToFit(col, w) )
         event.Skip();
 
     if ( !UpdateColumnWidthToFit(col, w) )
         event.Skip();


@@ -118,7 +145,7 @@ void wxHeaderCtrlBase::OnSeparatorDClick(wxHeaderCtrlEvent& event)
         UpdateColumn(col);
 }
 
         UpdateColumn(col);
 }
 

-#if wxUSE_MENU
+#if wxUSE_MENUS

 
 void wxHeaderCtrlBase::OnRClick(wxHeaderCtrlEvent& event)
 {
 
 void wxHeaderCtrlBase::OnRClick(wxHeaderCtrlEvent& event)
 {


@@ -131,7 +158,7 @@ void wxHeaderCtrlBase::OnRClick(wxHeaderCtrlEvent& event)
     ShowColumnsMenu(ScreenToClient(wxGetMousePosition()));
 }
 
     ShowColumnsMenu(ScreenToClient(wxGetMousePosition()));
 }
 

-#endif // wxUSE_MENU
+#endif // wxUSE_MENUS

 
 // ----------------------------------------------------------------------------
 // wxHeaderCtrlBase column reordering
 
 // ----------------------------------------------------------------------------
 // wxHeaderCtrlBase column reordering


@@ -269,7 +296,7 @@ wxHeaderCtrlBase::DoResizeColumnIndices(wxArrayInt& colIndices, unsigned int cou
 // wxHeaderCtrl extra UI
 // ----------------------------------------------------------------------------
 
 // wxHeaderCtrl extra UI
 // ----------------------------------------------------------------------------
 

-#if wxUSE_MENU
+#if wxUSE_MENUS

 
 void wxHeaderCtrlBase::AddColumnsItems(wxMenu& menu, int idColumnsBase)
 {
 
 void wxHeaderCtrlBase::AddColumnsItems(wxMenu& menu, int idColumnsBase)
 {


@@ -318,7 +345,7 @@ bool wxHeaderCtrlBase::ShowColumnsMenu(const wxPoint& pt, const wxString& title)
     return true;
 }
 
     return true;
 }
 

-#endif // wxUSE_MENU
+#endif // wxUSE_MENUS

 
 bool wxHeaderCtrlBase::ShowCustomizeDialog()
 {
 
 bool wxHeaderCtrlBase::ShowCustomizeDialog()
 {


@@ -430,7 +457,7 @@ void wxHeaderCtrlSimple::DoShowSortIndicator(unsigned int idx, bool ascending)
 {
     RemoveSortIndicator();
 
 {
     RemoveSortIndicator();
 

-    m_cols[idx].SetAsSortKey(ascending);
+    m_cols[idx].SetSortOrder(ascending);

     m_sortKey = idx;
 
     UpdateColumn(idx);
     m_sortKey = idx;
 
     UpdateColumn(idx);


@@ -467,21 +494,23 @@ wxHeaderCtrlSimple::UpdateColumnWidthToFit(unsigned int idx, int widthTitle)
 
 IMPLEMENT_DYNAMIC_CLASS(wxHeaderCtrlEvent, wxNotifyEvent)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxHeaderCtrlEvent, wxNotifyEvent)
 

-const wxEventType wxEVT_COMMAND_HEADER_CLICK = wxNewEventType();
-const wxEventType wxEVT_COMMAND_HEADER_RIGHT_CLICK = wxNewEventType();
-const wxEventType wxEVT_COMMAND_HEADER_MIDDLE_CLICK = wxNewEventType();
+wxDEFINE_EVENT( wxEVT_HEADER_CLICK, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_HEADER_RIGHT_CLICK, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_HEADER_MIDDLE_CLICK, wxHeaderCtrlEvent);
+
+wxDEFINE_EVENT( wxEVT_HEADER_DCLICK, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_HEADER_RIGHT_DCLICK, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_HEADER_MIDDLE_DCLICK, wxHeaderCtrlEvent);

 
 

-const wxEventType wxEVT_COMMAND_HEADER_DCLICK = wxNewEventType();
-const wxEventType wxEVT_COMMAND_HEADER_RIGHT_DCLICK = wxNewEventType();
-const wxEventType wxEVT_COMMAND_HEADER_MIDDLE_DCLICK = wxNewEventType();
+wxDEFINE_EVENT( wxEVT_HEADER_SEPARATOR_DCLICK, wxHeaderCtrlEvent);

 
 

-const wxEventType wxEVT_COMMAND_HEADER_SEPARATOR_DCLICK = wxNewEventType();
+wxDEFINE_EVENT( wxEVT_HEADER_BEGIN_RESIZE, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_HEADER_RESIZING, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_HEADER_END_RESIZE, wxHeaderCtrlEvent);

 
 

-const wxEventType wxEVT_COMMAND_HEADER_BEGIN_RESIZE = wxNewEventType();
-const wxEventType wxEVT_COMMAND_HEADER_RESIZING = wxNewEventType();
-const wxEventType wxEVT_COMMAND_HEADER_END_RESIZE = wxNewEventType();
+wxDEFINE_EVENT( wxEVT_HEADER_BEGIN_REORDER, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_HEADER_END_REORDER, wxHeaderCtrlEvent);

 
 

-const wxEventType wxEVT_COMMAND_HEADER_BEGIN_REORDER = wxNewEventType();
-const wxEventType wxEVT_COMMAND_HEADER_END_REORDER = wxNewEventType();
+wxDEFINE_EVENT( wxEVT_HEADER_DRAGGING_CANCELLED, wxHeaderCtrlEvent);

 
 

-const wxEventType wxEVT_COMMAND_HEADER_DRAGGING_CANCELLED = wxNewEventType();
+#endif // wxUSE_HEADERCTRL