X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/faef508f6a932cf5df0c9709843f148ada20a773..492d6611d43968a82a90a35ffe14c094d1f8d45d:/src/common/headerctrlcmn.cpp

diff --git a/src/common/headerctrlcmn.cpp b/src/common/headerctrlcmn.cpp
index a1d79fe4af..270e124bd2 100644
--- a/src/common/headerctrlcmn.cpp
+++ b/src/common/headerctrlcmn.cpp
@@ -23,6 +23,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_HEADERCTRL
+
 #ifndef WX_PRECOMP
     #include "wx/menu.h"
 #endif // WX_PRECOMP
@@ -43,6 +45,8 @@ const unsigned int wxNO_COLUMN = static_cast<unsigned>(-1);
 // wxHeaderColumnsRearrangeDialog: dialog for customizing our columns
 // ----------------------------------------------------------------------------
 
+#if wxUSE_REARRANGECTRL
+
 class wxHeaderColumnsRearrangeDialog : public wxRearrangeDialog
 {
 public:
@@ -61,6 +65,8 @@ public:
     }
 };
 
+#endif // wxUSE_REARRANGECTRL
+
 } // 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)
-#if wxUSE_MENU
+#if wxUSE_MENUS
     EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxHeaderCtrlBase::OnRClick)
-#endif // wxUSE_MENU
+#endif // wxUSE_MENUS
 END_EVENT_TABLE()
 
 void wxHeaderCtrlBase::ScrollWindow(int dx,
@@ -118,7 +124,7 @@ void wxHeaderCtrlBase::OnSeparatorDClick(wxHeaderCtrlEvent& event)
         UpdateColumn(col);
 }
 
-#if wxUSE_MENU
+#if wxUSE_MENUS
 
 void wxHeaderCtrlBase::OnRClick(wxHeaderCtrlEvent& event)
 {
@@ -131,7 +137,7 @@ void wxHeaderCtrlBase::OnRClick(wxHeaderCtrlEvent& event)
     ShowColumnsMenu(ScreenToClient(wxGetMousePosition()));
 }
 
-#endif // wxUSE_MENU
+#endif // wxUSE_MENUS
 
 // ----------------------------------------------------------------------------
 // wxHeaderCtrlBase column reordering
@@ -269,7 +275,7 @@ wxHeaderCtrlBase::DoResizeColumnIndices(wxArrayInt& colIndices, unsigned int cou
 // wxHeaderCtrl extra UI
 // ----------------------------------------------------------------------------
 
-#if wxUSE_MENU
+#if wxUSE_MENUS
 
 void wxHeaderCtrlBase::AddColumnsItems(wxMenu& menu, int idColumnsBase)
 {
@@ -318,10 +324,11 @@ bool wxHeaderCtrlBase::ShowColumnsMenu(const wxPoint& pt, const wxString& title)
     return true;
 }
 
-#endif // wxUSE_MENU
+#endif // wxUSE_MENUS
 
 bool wxHeaderCtrlBase::ShowCustomizeDialog()
 {
+#if wxUSE_REARRANGECTRL
     // prepare the data for showing the dialog
     wxArrayInt order = GetColumnsOrder();
 
@@ -348,29 +355,32 @@ bool wxHeaderCtrlBase::ShowCustomizeDialog()
 
     // do show it
     wxHeaderColumnsRearrangeDialog dlg(this, order, titles);
-    if ( dlg.ShowModal() != wxID_OK )
-        return false;
-
-    // and apply the changes
-    order = dlg.GetOrder();
-    for ( pos = 0; pos < count; pos++ )
+    if ( dlg.ShowModal() == wxID_OK )
     {
-        int& idx = order[pos];
-        const bool show = idx >= 0;
-        if ( !show )
+        // and apply the changes
+        order = dlg.GetOrder();
+        for ( pos = 0; pos < count; pos++ )
         {
-            // make all indices positive for passing them to SetColumnsOrder()
-            idx = ~idx;
+            int& idx = order[pos];
+            const bool show = idx >= 0;
+            if ( !show )
+            {
+                // make all indices positive for passing them to SetColumnsOrder()
+                idx = ~idx;
+            }
+
+            if ( show != GetColumn(idx).IsShown() )
+                UpdateColumnVisibility(idx, show);
         }
 
-        if ( show != GetColumn(idx).IsShown() )
-            UpdateColumnVisibility(idx, show);
-    }
+        UpdateColumnsOrder(order);
+        SetColumnsOrder(order);
 
-    UpdateColumnsOrder(order);
-    SetColumnsOrder(order);
+        return true;
+    }
+#endif // wxUSE_REARRANGECTRL
 
-    return true;
+    return false;
 }
 
 // ============================================================================
@@ -463,21 +473,23 @@ wxHeaderCtrlSimple::UpdateColumnWidthToFit(unsigned int idx, int widthTitle)
 
 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_COMMAND_HEADER_CLICK, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_RIGHT_CLICK, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_MIDDLE_CLICK, wxHeaderCtrlEvent);
+
+wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_DCLICK, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_RIGHT_DCLICK, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_COMMAND_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_COMMAND_HEADER_SEPARATOR_DCLICK, wxHeaderCtrlEvent);
 
-const wxEventType wxEVT_COMMAND_HEADER_SEPARATOR_DCLICK = wxNewEventType();
+wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_BEGIN_RESIZE, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_RESIZING, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_COMMAND_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_COMMAND_HEADER_BEGIN_REORDER, wxHeaderCtrlEvent);
+wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_END_REORDER, wxHeaderCtrlEvent);
 
-const wxEventType wxEVT_COMMAND_HEADER_BEGIN_REORDER = wxNewEventType();
-const wxEventType wxEVT_COMMAND_HEADER_END_REORDER = wxNewEventType();
+wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_DRAGGING_CANCELLED, wxHeaderCtrlEvent);
 
-const wxEventType wxEVT_COMMAND_HEADER_DRAGGING_CANCELLED = wxNewEventType();
+#endif // wxUSE_HEADERCTRL