added wxUSE_HEADERCTRL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
parent
65ead2309a
commit
e721a2a2a4
56
configure
vendored
56
configure
vendored
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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_
|
||||
|
||||
|
||||
@ -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_
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user