Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added compile guards to wxEditableListBox

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2007-04-25 09:22:02 +00:00
parent 23714996e9
commit 235751501d
5 changed files with 13843 additions and 14101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27924
configure vendored
View File

File diff suppressed because one or more lines are too long

9
configure.in
View File

@@ -536,6 +536,7 @@ if test $DEBUG_CONFIGURE = 1; then
DEFAULT_wxUSE_DISPLAY=no DEFAULT_wxUSE_DISPLAY=no
DEFAULT_wxUSE_DETECT_SM=no DEFAULT_wxUSE_DETECT_SM=no
DEFAULT_wxUSE_DIRPICKERCTRL=no DEFAULT_wxUSE_DIRPICKERCTRL=no
DEFAULT_wxUSE_EDITABLELISTBOX=no
DEFAULT_wxUSE_FILEPICKERCTRL=no DEFAULT_wxUSE_FILEPICKERCTRL=no
DEFAULT_wxUSE_FONTPICKERCTRL=no DEFAULT_wxUSE_FONTPICKERCTRL=no
DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_GAUGE=no
@@ -762,6 +763,7 @@ else
DEFAULT_wxUSE_DISPLAY=yes DEFAULT_wxUSE_DISPLAY=yes
DEFAULT_wxUSE_DETECT_SM=yes DEFAULT_wxUSE_DETECT_SM=yes
DEFAULT_wxUSE_DIRPICKERCTRL=yes DEFAULT_wxUSE_DIRPICKERCTRL=yes
DEFAULT_wxUSE_EDITABLELISTBOX=yes
DEFAULT_wxUSE_FILEPICKERCTRL=yes DEFAULT_wxUSE_FILEPICKERCTRL=yes
DEFAULT_wxUSE_FONTPICKERCTRL=yes DEFAULT_wxUSE_FONTPICKERCTRL=yes
DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GAUGE=yes
@@ -1203,6 +1205,7 @@ WX_ARG_ENABLE(datepick, [ --enable-datepick use wxDatePickerCtrl class
WX_ARG_ENABLE(dirpicker, [ --enable-dirpicker use wxDirPickerCtrl class], wxUSE_DIRPICKERCTRL) WX_ARG_ENABLE(dirpicker, [ --enable-dirpicker use wxDirPickerCtrl class], wxUSE_DIRPICKERCTRL)
WX_ARG_ENABLE(display, [ --enable-display use wxDisplay class], wxUSE_DISPLAY) WX_ARG_ENABLE(display, [ --enable-display use wxDisplay class], wxUSE_DISPLAY)
WX_ARG_ENABLE(detect_sm, [ --enable-detect_sm use code to detect X11 session manager], wxUSE_DETECT_SM) WX_ARG_ENABLE(detect_sm, [ --enable-detect_sm use code to detect X11 session manager], wxUSE_DETECT_SM)
WX_ARG_ENABLE(editablebox, [ --enable-editablebox use wxEditableListBox class], wxUSE_EDITABLELISTBOX)
WX_ARG_ENABLE(filepicker, [ --enable-filepicker use wxFilePickerCtrl class], wxUSE_FILEPICKERCTRL) WX_ARG_ENABLE(filepicker, [ --enable-filepicker use wxFilePickerCtrl class], wxUSE_FILEPICKERCTRL)
WX_ARG_ENABLE(fontpicker, [ --enable-fontpicker use wxFontPickerCtrl class], wxUSE_FONTPICKERCTRL) WX_ARG_ENABLE(fontpicker, [ --enable-fontpicker use wxFontPickerCtrl class], wxUSE_FONTPICKERCTRL)
WX_ARG_ENABLE(gauge, [ --enable-gauge use wxGauge class], wxUSE_GAUGE) WX_ARG_ENABLE(gauge, [ --enable-gauge use wxGauge class], wxUSE_GAUGE)
@@ -6863,6 +6866,12 @@ if test "$wxUSE_LISTCTRL" = "yes"; then
fi fi
fi fi
if test "$wxUSE_EDITABLELISTBOX" = "yes"; then
AC_DEFINE(wxUSE_EDITABLELISTBOX)
USES_CONTROLS=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS editlbox"
fi
if test "$wxUSE_NOTEBOOK" = "yes"; then if test "$wxUSE_NOTEBOOK" = "yes"; then
AC_DEFINE(wxUSE_NOTEBOOK) AC_DEFINE(wxUSE_NOTEBOOK)
USES_CONTROLS=1 USES_CONTROLS=1

6
include/wx/editlbox.h
View File

@@ -11,6 +11,10 @@
#ifndef __WX_EDITLBOX_H__ #ifndef __WX_EDITLBOX_H__
#define __WX_EDITLBOX_H__ #define __WX_EDITLBOX_H__
#include "wx/defs.h"
#if wxUSE_EDITABLELISTBOX
#include "wx/panel.h" #include "wx/panel.h"
class WXDLLEXPORT wxBitmapButton; class WXDLLEXPORT wxBitmapButton;
@@ -63,4 +67,6 @@ protected:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
#endif // wxUSE_EDITABLELISTBOX
#endif // __WX_EDITLBOX_H__ #endif // __WX_EDITLBOX_H__

1
setup.h.in
View File

@@ -325,6 +325,7 @@
#define wxUSE_DATAVIEWCTRL 0 #define wxUSE_DATAVIEWCTRL 0
#define wxUSE_DATEPICKCTRL 0 #define wxUSE_DATEPICKCTRL 0
#define wxUSE_DIRPICKERCTRL 0 #define wxUSE_DIRPICKERCTRL 0
#define wxUSE_EDITABLELISTBOX 0
#define wxUSE_FILEPICKERCTRL 0 #define wxUSE_FILEPICKERCTRL 0
#define wxUSE_FONTPICKERCTRL 0 #define wxUSE_FONTPICKERCTRL 0
#define wxUSE_GAUGE 0 #define wxUSE_GAUGE 0

4
src/generic/editlbox.cpp
View File

@@ -14,6 +14,8 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_EDITABLELISTBOX
// for all others, include the necessary headers (this file is usually all you // for all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWidgets headers) // need because it includes almost all "standard" wxWidgets headers)
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
@@ -376,3 +378,5 @@ void wxEditableListBox::OnDownItem(wxCommandEvent& WXUNUSED(event))
m_listCtrl->SetItemState(m_selection + 1, m_listCtrl->SetItemState(m_selection + 1,
wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
} }
#endif // wxUSE_EDITABLELISTBOX