added wxUSE_HEADERCTRL

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

diff --git a/configure b/configure
index 9fbca53ce483f88bcda26c34812234355710a9bb..fcefb14a0511b5d1b6f327961fdc8ad8dbe4d26b 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 57865 2009-01-06 22:28:16Z VS .
+# From configure.in Id: configure.in 58007 2009-01-11 00:46:55Z VZ .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
 #
@@ -1805,6 +1805,7 @@ Optional Features:
   --enable-fontpicker     use wxFontPickerCtrl class
   --enable-gauge          use wxGauge class
   --enable-grid           use wxGrid class
+  --enable-headerctrl     use wxHeaderCtrl class
   --enable-hyperlink      use wxHyperlinkCtrl class
   --enable-imaglist       use wxImageList class
   --enable-listbook       use wxListbook class
@@ -9440,6 +9441,7 @@ if test "$wxUSE_CONTROLS" = "no"; then
     DEFAULT_wxUSE_FONTPICKERCTRL=no
     DEFAULT_wxUSE_GAUGE=no
     DEFAULT_wxUSE_GRID=no
+    DEFAULT_wxUSE_HEADERCTRL=no
     DEFAULT_wxUSE_HYPERLINKCTRL=no
     DEFAULT_wxUSE_IMAGLIST=no
     DEFAULT_wxUSE_LISTBOOK=no
@@ -10616,6 +10618,50 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-headerctrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-headerctrl... $ECHO_C" >&6; }
+          # Check whether --enable-headerctrl was given.
+if test "${enable_headerctrl+set}" = set; then
+  enableval=$enable_headerctrl;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_headerctrl='wxUSE_HEADERCTRL=yes'
+                          else
+                            wx_cv_use_headerctrl='wxUSE_HEADERCTRL=no'
+                          fi
+
+else
+
+                          wx_cv_use_headerctrl='wxUSE_HEADERCTRL=${'DEFAULT_wxUSE_HEADERCTRL":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_headerctrl"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_HEADERCTRL = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_HEADERCTRL
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -45814,6 +45860,14 @@ _ACEOF
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
 fi
 
+if test "$wxUSE_HEADERCTRL" = "yes"; then
+  cat >>confdefs.h <<\_ACEOF
+#define wxUSE_HEADERCTRL 1
+_ACEOF
+
+  USES_CONTROLS=1
+fi
+
 if test "$wxUSE_HYPERLINKCTRL" = "yes"; then
   cat >>confdefs.h <<\_ACEOF
 #define wxUSE_HYPERLINKCTRL 1

diff --git a/configure.in b/configure.in
index 25143fd2369212872966a8e23c8f19fb7fba8e2f..6d8db5e0d3808984541c3fe20ab99ff40dad87c4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -817,6 +817,7 @@ if test "$wxUSE_CONTROLS" = "no"; then
     DEFAULT_wxUSE_FONTPICKERCTRL=no
     DEFAULT_wxUSE_GAUGE=no
     DEFAULT_wxUSE_GRID=no
+    DEFAULT_wxUSE_HEADERCTRL=no
     DEFAULT_wxUSE_HYPERLINKCTRL=no
     DEFAULT_wxUSE_IMAGLIST=no
     DEFAULT_wxUSE_LISTBOOK=no
@@ -875,6 +876,7 @@ WX_ARG_FEATURE(filepicker,  [  --enable-filepicker     use wxFilePickerCtrl clas
 WX_ARG_FEATURE(fontpicker,  [  --enable-fontpicker     use wxFontPickerCtrl class], wxUSE_FONTPICKERCTRL)
 WX_ARG_FEATURE(gauge,       [  --enable-gauge          use wxGauge class], wxUSE_GAUGE)
 WX_ARG_FEATURE(grid,        [  --enable-grid           use wxGrid class], wxUSE_GRID)
+WX_ARG_FEATURE(headerctrl,  [  --enable-headerctrl     use wxHeaderCtrl class], wxUSE_HEADERCTRL)
 WX_ARG_FEATURE(hyperlink,   [  --enable-hyperlink      use wxHyperlinkCtrl class], wxUSE_HYPERLINKCTRL)
 WX_ARG_FEATURE(imaglist,    [  --enable-imaglist       use wxImageList class], wxUSE_IMAGLIST)
 WX_ARG_FEATURE(listbook,    [  --enable-listbook       use wxListbook class], wxUSE_LISTBOOK)
@@ -6604,6 +6606,11 @@ if test "$wxUSE_GRID" = "yes"; then
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
 fi
 
+if test "$wxUSE_HEADERCTRL" = "yes"; then
+  AC_DEFINE(wxUSE_HEADERCTRL)
+  USES_CONTROLS=1
+fi
+
 if test "$wxUSE_HYPERLINKCTRL" = "yes"; then
   AC_DEFINE(wxUSE_HYPERLINKCTRL)
   USES_CONTROLS=1

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index bf19048ba58d1ab9e91366e8f40291e88f8e5a70..21497874b1f7c49761d60c9d0b6f1220c8bcef0a 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -619,6 +619,14 @@
 #   endif
 #endif /* !defined(wxUSE_GRID) */
 
+#ifndef wxUSE_HEADERCTRL
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_HEADERCTRL must be defined."
+#   else
+#       define wxUSE_HEADERCTRL 0
+#   endif
+#endif /* !defined(wxUSE_HEADERCTRL) */
+
 #ifndef wxUSE_HELP
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_HELP must be defined."
@@ -627,6 +635,14 @@
 #   endif
 #endif /* !defined(wxUSE_HELP) */
 
+#ifndef wxUSE_HEADERCTRL
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_HEADERCTRL must be defined."
+#   else
+#       define wxUSE_HEADERCTRL 0
+#   endif
+#endif /* !defined(wxUSE_HEADERCTRL) */
+
 #ifndef wxUSE_HYPERLINKCTRL
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_HYPERLINKCTRL must be defined."
@@ -1305,11 +1321,13 @@
     wxUSE_CHOICE || \
     wxUSE_GAUGE || \
     wxUSE_GRID || \
+    wxUSE_HEADERCTRL || \
     wxUSE_LISTBOX || \
     wxUSE_LISTCTRL || \
     wxUSE_NOTEBOOK || \
     wxUSE_RADIOBOX || \
     wxUSE_RADIOBTN || \
+    wxUSE_REARRANGECTRL || \
     wxUSE_SCROLLBAR || \
     wxUSE_SLIDER || \
     wxUSE_SPINBTN || \
@@ -1407,13 +1425,26 @@
 
 #if !wxUSE_ODCOMBOBOX
 #   if wxUSE_BITMAPCOMBOBOX
-#       error "wxBitmapComboBox requires wxOwnerDrawnComboBox"
-#   else
-#       undef wxUSE_BITMAPCOMBOBOX
-#       define wxUSE_BITMAPCOMBOBOX 0
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxBitmapComboBox requires wxOwnerDrawnComboBox"
+#       else
+#           undef wxUSE_BITMAPCOMBOBOX
+#           define wxUSE_BITMAPCOMBOBOX 0
+#       endif
 #   endif
 #endif /* !wxUSE_ODCOMBOBOX */
 
+#if !wxUSE_HEADERCTRL
+#   if wxUSE_DATAVIEWCTRL || wxUSE_GRID
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxDataViewCtrl and wxGrid require wxHeaderCtrl"
+#       else
+#           undef wxUSE_HEADERCTRL
+#           define wxUSE_HEADERCTRL 1
+#       endif
+#   endif
+#endif /* !wxUSE_HEADERCTRL */
+
 /* don't attempt to use native status bar on the platforms not having it */
 #ifndef wxUSE_NATIVE_STATUSBAR
 #   define wxUSE_NATIVE_STATUSBAR 0

diff --git a/include/wx/headercol.h b/include/wx/headercol.h
index a84c175858b797c638aa73a601d97326b9f7fdb7..a52713d2285f7d343d06287c0309c811effd95ce 100644 (file)
--- a/include/wx/headercol.h
+++ b/include/wx/headercol.h
@@ -13,6 +13,8 @@
 
 #include "wx/bitmap.h"
 
+#if wxUSE_HEADERCTRL
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -268,5 +270,8 @@ private:
     bool m_sort,
          m_sortAscending;
 };
+
+#endif // wxUSE_HEADERCTRL
+
 #endif // _WX_HEADERCOL_H_
 

diff --git a/include/wx/headerctrl.h b/include/wx/headerctrl.h
index c774162bde32eec1741887061e97348c783ed29b..d1d0e4c1762e65b32985a99fe7339aa5c0869bb1 100644 (file)
--- a/include/wx/headerctrl.h
+++ b/include/wx/headerctrl.h
@@ -13,6 +13,8 @@
 
 #include "wx/control.h"
 
+#if wxUSE_HEADERCTRL
+
 #include "wx/dynarray.h"
 #include "wx/vector.h"
 
@@ -461,4 +463,6 @@ typedef void (wxEvtHandler::*wxHeaderCtrlEventFunction)(wxHeaderCtrlEvent&);
 
 #define EVT_HEADER_DRAGGING_CANCELLED(id, fn) wx__DECLARE_HEADER_EVT(DRAGGING_CANCELLED, id, fn)
 
+#endif // wxUSE_HEADERCTRL
+
 #endif // _WX_HEADERCTRL_H_

diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h
index db9c472c78762b7ecf5a5a2844f5a3abafc427b2..451b18c5380c2096c01a21c582d91881d2c33e4a 100644 (file)
--- a/include/wx/motif/setup0.h
+++ b/include/wx/motif/setup0.h
@@ -691,6 +691,7 @@
 #define wxUSE_FILEPICKERCTRL 1  // wxFilePickerCtrl
 #define wxUSE_FONTPICKERCTRL 1  // wxFontPickerCtrl
 #define wxUSE_GAUGE         1   // wxGauge
+#define wxUSE_HEADERCTRL    1   // wxHeaderCtrl
 #define wxUSE_HYPERLINKCTRL 1   // wxHyperlinkCtrl
 #define wxUSE_LISTBOX       1   // wxListBox
 #define wxUSE_LISTCTRL      1   // wxListCtrl

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index d71d0b69ff7688eeeddf4471280dbbc3a30c86a9..a3471b7dc3a4890b6ae7f4f9af326b4d25770a54 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -691,6 +691,7 @@
 #define wxUSE_FILEPICKERCTRL 1  // wxFilePickerCtrl
 #define wxUSE_FONTPICKERCTRL 1  // wxFontPickerCtrl
 #define wxUSE_GAUGE         1   // wxGauge
+#define wxUSE_HEADERCTRL    1   // wxHeaderCtrl
 #define wxUSE_HYPERLINKCTRL 1   // wxHyperlinkCtrl
 #define wxUSE_LISTBOX       1   // wxListBox
 #define wxUSE_LISTCTRL      1   // wxListCtrl

diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index 1d56ed74426664f45069557e1657fad818470e74..300eecc4e9c2410c8902ff54931d08cb11f886b7 100644 (file)
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -691,6 +691,7 @@
 #define wxUSE_FILEPICKERCTRL 1  // wxFilePickerCtrl
 #define wxUSE_FONTPICKERCTRL 1  // wxFontPickerCtrl
 #define wxUSE_GAUGE         1   // wxGauge
+#define wxUSE_HEADERCTRL    1   // wxHeaderCtrl
 #define wxUSE_HYPERLINKCTRL 1   // wxHyperlinkCtrl
 #define wxUSE_LISTBOX       1   // wxListBox
 #define wxUSE_LISTCTRL      1   // wxListCtrl

diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index 4befbfd0fc18f037b63170f0120b5c67c57a012b..04b27f059d67650316fc174d90a190d3ec62441a 100644 (file)
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -691,6 +691,7 @@
 #define wxUSE_FILEPICKERCTRL 1  // wxFilePickerCtrl
 #define wxUSE_FONTPICKERCTRL 1  // wxFontPickerCtrl
 #define wxUSE_GAUGE         1   // wxGauge
+#define wxUSE_HEADERCTRL    1   // wxHeaderCtrl
 #define wxUSE_HYPERLINKCTRL 1   // wxHyperlinkCtrl
 #define wxUSE_LISTBOX       1   // wxListBox
 #define wxUSE_LISTCTRL      1   // wxListCtrl

diff --git a/include/wx/osx/setup0.h b/include/wx/osx/setup0.h
index b498e66a520ca47a297cf94b295e7798ee622cd7..ccf753d9fd1506448dacee9c2f8e4f65c9b1d7bf 100644 (file)
--- a/include/wx/osx/setup0.h
+++ b/include/wx/osx/setup0.h
@@ -692,6 +692,7 @@
 #define wxUSE_FILEPICKERCTRL 1  // wxFilePickerCtrl
 #define wxUSE_FONTPICKERCTRL 1  // wxFontPickerCtrl
 #define wxUSE_GAUGE         1   // wxGauge
+#define wxUSE_HEADERCTRL    1   // wxHeaderCtrl
 #define wxUSE_HYPERLINKCTRL 1   // wxHyperlinkCtrl
 #define wxUSE_LISTBOX       1   // wxListBox
 #define wxUSE_LISTCTRL      1   // wxListCtrl

diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h
index 4cfc3d0a08c3f45bb8cedb98d062910db20f5e12..04917f436f03f9f8e31863e98c8bc0a4cb3cf273 100644 (file)
--- a/include/wx/palmos/setup0.h
+++ b/include/wx/palmos/setup0.h
@@ -691,6 +691,7 @@
 #define wxUSE_FILEPICKERCTRL 1  // wxFilePickerCtrl
 #define wxUSE_FONTPICKERCTRL 1  // wxFontPickerCtrl
 #define wxUSE_GAUGE         1   // wxGauge
+#define wxUSE_HEADERCTRL    1   // wxHeaderCtrl
 #define wxUSE_HYPERLINKCTRL 1   // wxHyperlinkCtrl
 #define wxUSE_LISTBOX       1   // wxListBox
 #define wxUSE_LISTCTRL      1   // wxListCtrl

diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index bafac5cdd8b67949fcd24ced045d6015ae12a60d..4f21e8a492bfe5f60c2dff6c0bd0c92b82810891 100644 (file)
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -687,6 +687,7 @@
 #define wxUSE_FILEPICKERCTRL 1  // wxFilePickerCtrl
 #define wxUSE_FONTPICKERCTRL 1  // wxFontPickerCtrl
 #define wxUSE_GAUGE         1   // wxGauge
+#define wxUSE_HEADERCTRL    1   // wxHeaderCtrl
 #define wxUSE_HYPERLINKCTRL 1   // wxHyperlinkCtrl
 #define wxUSE_LISTBOX       1   // wxListBox
 #define wxUSE_LISTCTRL      1   // wxListCtrl

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index 50efe043bb648ddb0be0c1c0d2c6aa6b47b5e358..3e8f5754a2372a6357276e21c74516a95170b4a9 100644 (file)
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -690,6 +690,7 @@
 #define wxUSE_FILEPICKERCTRL 1  // wxFilePickerCtrl
 #define wxUSE_FONTPICKERCTRL 1  // wxFontPickerCtrl
 #define wxUSE_GAUGE         1   // wxGauge
+#define wxUSE_HEADERCTRL    1   // wxHeaderCtrl
 #define wxUSE_HYPERLINKCTRL 1   // wxHyperlinkCtrl
 #define wxUSE_LISTBOX       1   // wxListBox
 #define wxUSE_LISTCTRL      1   // wxListCtrl

diff --git a/setup.h.in b/setup.h.in
index db432fca599f7aa1eb7523876ae0dac242817d8a..0ee1a1b882564a303c45667f5d1b5cfdd5e1ad8a 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -341,6 +341,7 @@
 #define wxUSE_FILEPICKERCTRL 0
 #define wxUSE_FONTPICKERCTRL 0
 #define wxUSE_GAUGE         0
+#define wxUSE_HEADERCTRL    0
 #define wxUSE_HYPERLINKCTRL 0
 #define wxUSE_LISTBOX       0
 #define wxUSE_LISTCTRL      0

diff --git a/src/common/headercolcmn.cpp b/src/common/headercolcmn.cpp
index 27e4843300d8c87a32c5f9708cf7c8920aeb2b4c..8537970fa54fa0d600777272bf8bd9f2dcf58b64 100644 (file)
--- a/src/common/headercolcmn.cpp
+++ b/src/common/headercolcmn.cpp
@@ -23,8 +23,7 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-#endif // WX_PRECOMP
+#if wxUSE_HEADERCTRL
 
 #include "wx/headercol.h"
 
@@ -91,4 +90,5 @@ void wxSettableHeaderColumn::ToggleFlag(int flag)
     SetFlags(flags);
 }
 
+#endif // wxUSE_HEADERCTRL
 

diff --git a/src/common/headerctrlcmn.cpp b/src/common/headerctrlcmn.cpp
index 991dc7b710518dbe455c342a689db71db917c432..a7a197afebf23f525be65dd22ff5b46e6802d7f6 100644 (file)
--- 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
@@ -485,3 +487,5 @@ const wxEventType wxEVT_COMMAND_HEADER_BEGIN_REORDER = wxNewEventType();
 const wxEventType wxEVT_COMMAND_HEADER_END_REORDER = wxNewEventType();
 
 const wxEventType wxEVT_COMMAND_HEADER_DRAGGING_CANCELLED = wxNewEventType();
+
+#endif // wxUSE_HEADERCTRL

diff --git a/src/generic/headerctrlg.cpp b/src/generic/headerctrlg.cpp
index 37d848fc184d9a4ddfef2ed873e1be3978494c02..90afc8de8fb6be9bbf62b7d5d99981624ab8d6ca 100644 (file)
--- a/src/generic/headerctrlg.cpp
+++ b/src/generic/headerctrlg.cpp
@@ -23,8 +23,7 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-#endif // WX_PRECOMP
+#if wxUSE_HEADERCTRL
 
 #include "wx/headerctrl.h"
 
@@ -714,3 +713,5 @@ void wxHeaderCtrl::OnMouse(wxMouseEvent& mevent)
 }
 
 #endif // wxHAS_GENERIC_HEADERCTRL
+
+#endif // wxUSE_HEADERCTRL

diff --git a/src/msw/headerctrl.cpp b/src/msw/headerctrl.cpp
index 7ab562e2baeca855c29326580222c2d16d36711c..21d83f63888f3360c4d5a9e271d14b362927f640 100644 (file)
--- a/src/msw/headerctrl.cpp
+++ b/src/msw/headerctrl.cpp
@@ -23,6 +23,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_HEADERCTRL
+
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 #endif // WX_PRECOMP
@@ -660,3 +662,5 @@ bool wxHeaderCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 }
 
 #endif // wxHAS_GENERIC_HEADERCTRL
+
+#endif // wxUSE_HEADERCTRL