diff --git a/configure b/configure index 958846b142..d7ce1d6d18 100755 --- a/configure +++ b/configure @@ -37856,7 +37856,7 @@ LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK $LIBS" if test "$wxUSE_GUI" = "yes"; then - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \ + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov dialogs drawing \ erase event exec font image minimal power render \ shaped svg taborder vscroll widgets wrapsizer" diff --git a/configure.in b/configure.in index cb95fb6fb1..21308989ea 100644 --- a/configure.in +++ b/configure.in @@ -7489,7 +7489,7 @@ if test "$wxUSE_GUI" = "yes"; then dnl library features they need are present) dnl TODO some samples are never built so far: mfc (requires VC++) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \ + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov dialogs drawing \ erase event exec font image minimal power render \ shaped svg taborder vscroll widgets wrapsizer" diff --git a/docs/doxygen/mainpages/samples.h b/docs/doxygen/mainpages/samples.h index f3efc78f91..cbeeab85a9 100644 --- a/docs/doxygen/mainpages/samples.h +++ b/docs/doxygen/mainpages/samples.h @@ -133,37 +133,6 @@ See @ref overview_config for the descriptions of all features of this class. @sampledir{console} -@section page_samples_controls Controls Sample - -The controls sample is the main test program for most simple controls used in -wxWidgets. The sample tests their basic functionality, events, placement, -modification in terms of colour and font as well as the possibility to change -the controls programmatically, such as adding an item to a list box etc. Apart -from that, the sample uses a wxNotebook and tests most -features of this special control (using bitmap in the tabs, using -wxSizer instances and wxLayoutConstraints within notebook pages, advancing pages -programmatically and vetoing a page change by intercepting the wxNotebookEvent. - -The various controls tested are listed here: - -@li wxButton -@li wxBitmapButton -@li wxCheckBox -@li wxChoice -@li wxComboBox -@li wxGauge -@li wxStaticBox -@li wxListBox -@li wxSpinCtrl -@li wxSpinButton -@li wxStaticText -@li wxStaticBitmap -@li wxRadioBox -@li wxRadioButton -@li wxSlider - -@sampledir{controls} - @section page_samples_dataview wxDataViewCtrl Sample @sampleabout{wxDataViewCtrl} diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in deleted file mode 100644 index 93e8a1dc90..0000000000 --- a/samples/controls/Makefile.in +++ /dev/null @@ -1,202 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - - -@MAKE_SET@ - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -datarootdir = @datarootdir@ -INSTALL = @INSTALL@ -EXEEXT = @EXEEXT@ -WINDRES = @WINDRES@ -SETFILE = @SETFILE@ -NM = @NM@ -BK_DEPS = @BK_DEPS@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -LIBS = @LIBS@ -LDFLAGS_GUI = @LDFLAGS_GUI@ -CXX = @CXX@ -CXXFLAGS = @CXXFLAGS@ -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ -TOOLKIT = @TOOLKIT@ -TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ -TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@ -EXTRALIBS = @EXTRALIBS@ -EXTRALIBS_XML = @EXTRALIBS_XML@ -EXTRALIBS_GUI = @EXTRALIBS_GUI@ -CXXWARNINGS = @CXXWARNINGS@ -HOST_SUFFIX = @HOST_SUFFIX@ -SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ -SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@ -wx_top_builddir = @wx_top_builddir@ - -### Variables: ### - -DESTDIR = -WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 -LIBDIRNAME = $(wx_top_builddir)/lib -CONTROLS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \ - $(CXXWARNINGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) -CONTROLS_OBJECTS = \ - controls_controls.o \ - $(__controls___win32rc) - -### Conditionally set variables: ### - -@COND_DEPS_TRACKING_0@CXXC = $(CXX) -@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) -@COND_USE_GUI_0@PORTNAME = base -@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) -@COND_TOOLKIT_MAC@WXBASEPORT = _carbon -@COND_BUILD_debug@WXDEBUGFLAG = d -@COND_UNICODE_1@WXUNICODEFLAG = u -@COND_WXUNIV_1@WXUNIVNAME = univ -@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS) -@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) \ -@COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) -@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) -@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__controls___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__controls___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL controls$(EXEEXT) -@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS -@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI -@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS -@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL -COND_PLATFORM_OS2_1___controls___os2_emxbindcmd = $(NM) controls$(EXEEXT) | if \ - grep -q pmwin.763 ; then emxbind -ep controls$(EXEEXT) ; fi -@COND_PLATFORM_OS2_1@__controls___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___controls___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_MACOSX_1@__controls_app_Contents_PkgInfo___depname \ -@COND_PLATFORM_MACOSX_1@ = controls.app/Contents/PkgInfo -@COND_PLATFORM_MACOSX_1@__controls_bundle___depname = controls_bundle -@COND_TOOLKIT_MAC@____controls_BUNDLE_TGT_REF_DEP = \ -@COND_TOOLKIT_MAC@ $(__controls_app_Contents_PkgInfo___depname) -@COND_TOOLKIT_OSX_CARBON@____controls_BUNDLE_TGT_REF_DEP \ -@COND_TOOLKIT_OSX_CARBON@ = $(__controls_app_Contents_PkgInfo___depname) -@COND_TOOLKIT_OSX_COCOA@____controls_BUNDLE_TGT_REF_DEP \ -@COND_TOOLKIT_OSX_COCOA@ = $(__controls_app_Contents_PkgInfo___depname) -@COND_TOOLKIT_OSX_IPHONE@____controls_BUNDLE_TGT_REF_DEP \ -@COND_TOOLKIT_OSX_IPHONE@ = $(__controls_app_Contents_PkgInfo___depname) -@COND_TOOLKIT_COCOA@____controls_BUNDLE_TGT_REF_DEP = \ -@COND_TOOLKIT_COCOA@ $(__controls_app_Contents_PkgInfo___depname) -COND_MONOLITHIC_0___WXLIB_CORE_p = \ - -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) -COND_MONOLITHIC_0___WXLIB_BASE_p = \ - -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) -@COND_PLATFORM_WIN32_1@__controls___win32rc = controls_controls_rc.o -COND_MONOLITHIC_1___WXLIB_MONO_p = \ - -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) -@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \ -@COND_MONOLITHIC_1_USE_STC_1@ = \ -@COND_MONOLITHIC_1_USE_STC_1@ -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \ -@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \ -@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \ -@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \ -@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \ -@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \ -@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \ -@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ - -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p) -@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \ -@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) - -### Targets: ### - -all: controls$(EXEEXT) $(__controls_bundle___depname) data - -install: - -uninstall: - -install-strip: install - -clean: - rm -rf ./.deps ./.pch - rm -f ./*.o - rm -f controls$(EXEEXT) - rm -rf controls.app - -distclean: clean - rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile - -controls$(EXEEXT): $(CONTROLS_OBJECTS) $(__controls___win32rc) - $(CXX) -o $@ $(CONTROLS_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__controls___mac_setfilecmd) - $(__controls___os2_emxbindcmd) - -@COND_PLATFORM_MACOSX_1@controls.app/Contents/PkgInfo: controls$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns -@COND_PLATFORM_MACOSX_1@ mkdir -p controls.app/Contents -@COND_PLATFORM_MACOSX_1@ mkdir -p controls.app/Contents/MacOS -@COND_PLATFORM_MACOSX_1@ mkdir -p controls.app/Contents/Resources -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -@COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/controls/" \ -@COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >controls.app/Contents/Info.plist -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ /bin/echo "APPL????" >controls.app/Contents/PkgInfo -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ ln -f controls$(EXEEXT) controls.app/Contents/MacOS/controls -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns controls.app/Contents/Resources/wxmac.icns - -@COND_PLATFORM_MACOSX_1@controls_bundle: $(____controls_BUNDLE_TGT_REF_DEP) - -data: - @mkdir -p . - @for f in test2.bmp; do \ - if test ! -f ./$$f -a ! -d ./$$f ; \ - then x=yep ; \ - else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \ - fi; \ - case "$$x" in ?*) \ - cp -pRf $(srcdir)/$$f . ;; \ - esac; \ - done - -controls_controls.o: $(srcdir)/controls.cpp - $(CXXC) -c -o $@ $(CONTROLS_CXXFLAGS) $(srcdir)/controls.cpp - -controls_controls_rc.o: $(srcdir)/controls.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include - - -# Include dependency info, if present: -@IF_GNU_MAKE@-include ./.deps/*.d - -.PHONY: all install uninstall clean distclean controls_bundle data diff --git a/samples/controls/controls.bkl b/samples/controls/controls.bkl deleted file mode 100644 index 0368e34b9b..0000000000 --- a/samples/controls/controls.bkl +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - controls.cpp - core - base - controls.rc - - - - - test2.bmp - - - - diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp deleted file mode 100644 index 6ce5f135a6..0000000000 --- a/samples/controls/controls.cpp +++ /dev/null @@ -1,2196 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: controls.cpp -// Purpose: Controls wxWidgets sample -// Author: Robert Roebling -// Modified by: -// Copyright: (c) Robert Roebling, Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/wx.h" -#endif - -#include "wx/spinbutt.h" -#include "wx/tglbtn.h" -#include "wx/bookctrl.h" -#include "wx/imaglist.h" -#include "wx/artprov.h" -#include "wx/cshelp.h" -#include "wx/gbsizer.h" - -#if wxUSE_TOOLTIPS - #include "wx/tooltip.h" -#ifdef __WXMSW__ - #include "wx/numdlg.h" -#endif // __WXMSW__ -#endif // wxUSE_TOOLTIPS - -#ifndef __WXMSW__ - #include "icons/choice.xpm" - #include "icons/combo.xpm" - #include "icons/list.xpm" - #include "icons/radio.xpm" - #include "icons/text.xpm" - #include "icons/gauge.xpm" -#endif - -#ifndef wxUSE_SPINBTN - #define wxUSE_SPINBTN 1 -#endif - -#include "wx/progdlg.h" - -#if wxUSE_SPINCTRL - #include "wx/spinctrl.h" -#endif // wxUSE_SPINCTRL - -#if !wxUSE_TOGGLEBTN - #define wxToggleButton wxCheckBox - #define EVT_TOGGLEBUTTON EVT_CHECKBOX -#endif - -#ifndef wxHAS_IMAGES_IN_RESOURCES - #include "../sample.xpm" -#endif - -//---------------------------------------------------------------------- -// class definitions -//---------------------------------------------------------------------- - -class MyApp: public wxApp -{ -public: - bool OnInit() wxOVERRIDE; -}; - -class MyPanel: public wxPanel -{ -public: - MyPanel(wxFrame *frame, int x, int y, int w, int h); - virtual ~MyPanel(); - -#if wxUSE_TOOLTIPS - void SetAllToolTips(); -#endif // wxUSE_TOOLTIPS - - void OnIdle( wxIdleEvent &event ); - void OnListBox( wxCommandEvent &event ); - void OnListBoxDoubleClick( wxCommandEvent &event ); - void OnListBoxButtons( wxCommandEvent &event ); -#if wxUSE_CHOICE - void OnChoice( wxCommandEvent &event ); - void OnChoiceButtons( wxCommandEvent &event ); -#endif - void OnCombo( wxCommandEvent &event ); - void OnComboTextChanged( wxCommandEvent &event ); - void OnComboTextEnter( wxCommandEvent &event ); - void OnComboButtons( wxCommandEvent &event ); - void OnRadio( wxCommandEvent &event ); - void OnRadioButtons( wxCommandEvent &event ); - void OnRadioButton1( wxCommandEvent &event ); - void OnRadioButton2( wxCommandEvent &event ); - void OnSetFont( wxCommandEvent &event ); - void OnPageChanged( wxBookCtrlEvent &event ); - void OnPageChanging( wxBookCtrlEvent &event ); - void OnSliderUpdate( wxCommandEvent &event ); - void OnUpdateLabel( wxCommandEvent &event ); -#if wxUSE_SPINBTN - void OnSpinUp( wxSpinEvent &event ); - void OnSpinDown( wxSpinEvent &event ); - void OnSpinUpdate( wxSpinEvent &event ); - void OnSpinTextChanged(wxCommandEvent& event); - void OnSpinTextEnter(wxCommandEvent& WXUNUSED(event)); -#if wxUSE_PROGRESSDLG - void OnUpdateShowProgress( wxUpdateUIEvent& event ); - void OnShowProgress( wxCommandEvent &event ); -#endif // wxUSE_PROGRESSDLG -#endif // wxUSE_SPINBTN - void OnNewText( wxCommandEvent &event ); -#if wxUSE_SPINCTRL - void OnSpinCtrl(wxSpinEvent& event); - void OnSpinCtrlUp(wxSpinEvent& event); - void OnSpinCtrlDown(wxSpinEvent& event); - void OnSpinCtrlText(wxCommandEvent& event); -#endif // wxUSE_SPINCTRL - - void OnEnableAll(wxCommandEvent& event); - void OnChangeColour(wxCommandEvent& event); - void OnChangeCheck(wxCommandEvent& event); - void OnTestButton(wxCommandEvent& event); - void OnBmpButton(wxCommandEvent& event); - void OnBmpButtonToggle(wxCommandEvent& event); - - void OnSizerCheck (wxCommandEvent &event); - - wxCheckListBox *m_listbox, - *m_listboxSorted; -#if wxUSE_CHOICE - wxChoice *m_choice, - *m_choiceSorted; -#endif // wxUSE_CHOICE - - wxComboBox *m_combo; - wxRadioBox *m_radio; -#if wxUSE_GAUGE - wxGauge *m_gauge, - *m_gaugeVert; -#endif // wxUSE_GAUGE -#if wxUSE_SLIDER - wxSlider *m_slider; -#endif // wxUSE_SLIDER - wxButton *m_fontButton; - wxButton *m_lbSelectNum; - wxButton *m_lbSelectThis; -#if wxUSE_SPINBTN - wxSpinButton *m_spinbutton; -#if wxUSE_PROGRESSDLG - wxButton *m_btnProgress; -#endif // wxUSE_PROGRESSDLG -#endif // wxUSE_SPINBTN - wxStaticText *m_wrappingText; - wxStaticText *m_nonWrappingText; - -#if wxUSE_SPINCTRL - wxSpinCtrl *m_spinctrl; -#endif // wxUSE_SPINCTRL - - wxTextCtrl *m_spintext; - wxCheckBox *m_checkbox; - - wxTextCtrl *m_text; - wxBookCtrl *m_book; - - wxStaticText *m_label; - - wxBoxSizer *m_buttonSizer; - wxButton *m_sizerBtn1; - wxButton *m_sizerBtn2; - wxButton *m_sizerBtn3; - wxButton *m_sizerBtn4; - wxBoxSizer *m_hsizer; - wxButton *m_bigBtn; - -private: - wxLog *m_logTargetOld; - - wxDECLARE_EVENT_TABLE(); -}; - -class MyFrame: public wxFrame -{ -public: - MyFrame(const wxChar *title, int x, int y); - - void OnQuit(wxCommandEvent& event); - void OnAbout(wxCommandEvent& event); - void OnClearLog(wxCommandEvent& event); - -#if wxUSE_TOOLTIPS - void OnSetTooltipDelay(wxCommandEvent& event); - void OnToggleTooltips(wxCommandEvent& event); -#ifdef __WXMSW__ - void OnSetMaxTooltipWidth(wxCommandEvent& event); -#endif // __WXMSW__ -#endif // wxUSE_TOOLTIPS - - void OnEnableAll(wxCommandEvent& event); - void OnHideAll(wxCommandEvent& event); - void OnHideList(wxCommandEvent& event); - void OnContextHelp(wxCommandEvent& event); - - void OnIdle( wxIdleEvent& event ); - void OnIconized( wxIconizeEvent& event ); - void OnMaximized( wxMaximizeEvent& event ); - void OnSize( wxSizeEvent& event ); - void OnMove( wxMoveEvent& event ); - - MyPanel *GetPanel() const { return m_panel; } - -private: -#if wxUSE_STATUSBAR - void UpdateStatusBar(const wxPoint& pos, const wxSize& size) - { - if ( m_frameStatusBar ) - { - wxString msg; - wxSize sizeAll = GetSize(), - sizeCl = GetClientSize(); - msg.Printf(_("pos=(%d, %d), size=%dx%d or %dx%d (client=%dx%d)"), - pos.x, pos.y, - size.x, size.y, - sizeAll.x, sizeAll.y, - sizeCl.x, sizeCl.y); - SetStatusText(msg, 1); - } - } -#endif // wxUSE_STATUSBAR - - MyPanel *m_panel; - - wxDECLARE_EVENT_TABLE(); -}; - -// a button which intercepts double clicks (for testing...) -class MyButton : public wxButton -{ -public: - MyButton(wxWindow *parent, - wxWindowID id, - const wxString& label = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize) - : wxButton(parent, id, label, pos, size) - { - } - - void OnDClick(wxMouseEvent& event) - { - wxLogMessage(wxT("MyButton::OnDClick")); - - event.Skip(); - } - -private: - wxDECLARE_EVENT_TABLE(); -}; - -// a combo which intercepts chars (to test Windows behaviour) -class MyComboBox : public wxComboBox -{ -public: - MyComboBox(wxWindow *parent, wxWindowID id, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr) - : wxComboBox(parent, id, value, pos, size, n, choices, style, - validator, name) { } - -protected: - void OnChar(wxKeyEvent& event); - void OnKeyDown(wxKeyEvent& event); - void OnKeyUp(wxKeyEvent& event); - void OnFocusGot(wxFocusEvent& event) - { - wxLogMessage(wxT("MyComboBox::OnFocusGot")); - - event.Skip(); - } - -private: - wxDECLARE_EVENT_TABLE(); -}; - -// a radiobox which handles focus set/kill (for testing) -class MyRadioBox : public wxRadioBox -{ -public: - MyRadioBox(wxWindow *parent, - wxWindowID id, - const wxString& title = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - int majorDim = 1, - long style = wxRA_SPECIFY_COLS, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr) - : wxRadioBox(parent, id, title, pos, size, n, choices, majorDim, - style, validator, name) - { - } - -protected: - void OnFocusGot(wxFocusEvent& event) - { - wxLogMessage(wxT("MyRadioBox::OnFocusGot")); - - event.Skip(); - } - - void OnFocusLost(wxFocusEvent& event) - { - wxLogMessage(wxT("MyRadioBox::OnFocusLost")); - - event.Skip(); - } - -private: - wxDECLARE_EVENT_TABLE(); -}; - -// a choice which handles focus set/kill (for testing) -class MyChoice : public wxChoice -{ -public: - MyChoice(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr ) - : wxChoice(parent, id, pos, size, n, choices, - style, validator, name) { } - -protected: - void OnFocusGot(wxFocusEvent& event) - { - wxLogMessage(wxT("MyChoice::OnFocusGot")); - - event.Skip(); - } - - void OnFocusLost(wxFocusEvent& event) - { - wxLogMessage(wxT("MyChoice::OnFocusLost")); - - event.Skip(); - } - -private: - wxDECLARE_EVENT_TABLE(); -}; - - - -//---------------------------------------------------------------------- -// other -//---------------------------------------------------------------------- - -static void SetListboxClientData(const wxChar *name, wxCheckListBox *control); - -#if wxUSE_CHOICE -static void SetChoiceClientData(const wxChar *name, wxChoice *control); -#endif // wxUSE_CHOICE - -wxIMPLEMENT_APP(MyApp); - -//---------------------------------------------------------------------- -// MyApp -//---------------------------------------------------------------------- - -enum -{ - CONTROLS_QUIT = wxID_EXIT, - CONTROLS_ABOUT = wxID_ABOUT, - CONTROLS_TEXT = 100, - CONTROLS_CLEAR_LOG, - - // tooltip menu - CONTROLS_SET_TOOLTIP_DELAY = 200, - CONTROLS_ENABLE_TOOLTIPS, - CONTROLS_SET_TOOLTIPS_MAX_WIDTH, - - // panel menu - CONTROLS_ENABLE_ALL, - CONTROLS_HIDE_ALL, - CONTROLS_HIDE_LIST, - CONTROLS_CONTEXT_HELP -}; - -bool MyApp::OnInit() -{ - // use standard command line handling: - if ( !wxApp::OnInit() ) - return false; - - // parse the cmd line - int x = 50, - y = 50; - if ( argc == 3 ) - { - wxSscanf(wxString(argv[1]), wxT("%d"), &x); - wxSscanf(wxString(argv[2]), wxT("%d"), &y); - } - -#if wxUSE_HELP - wxHelpProvider::Set( new wxSimpleHelpProvider ); -#endif // wxUSE_HELP - - // Create the main frame window - MyFrame *frame = new MyFrame(wxT("Controls wxWidgets App"), x, y); - frame->Show(true); - - return true; -} - -//---------------------------------------------------------------------- -// MyPanel -//---------------------------------------------------------------------- - -const int ID_BOOK = 1000; - -const int ID_LISTBOX = 130; -const int ID_LISTBOX_SEL_NUM = 131; -const int ID_LISTBOX_SEL_STR = 132; -const int ID_LISTBOX_CLEAR = 133; -const int ID_LISTBOX_APPEND = 134; -const int ID_LISTBOX_DELETE = 135; -const int ID_LISTBOX_FONT = 136; -const int ID_LISTBOX_ENABLE = 137; -const int ID_LISTBOX_SORTED = 138; - -const int ID_CHOICE = 120; -const int ID_CHOICE_SEL_NUM = 121; -const int ID_CHOICE_SEL_STR = 122; -const int ID_CHOICE_CLEAR = 123; -const int ID_CHOICE_APPEND = 124; -const int ID_CHOICE_DELETE = 125; -const int ID_CHOICE_FONT = 126; -const int ID_CHOICE_ENABLE = 127; -const int ID_CHOICE_SORTED = 128; - -const int ID_COMBO = 140; -const int ID_COMBO_SEL_NUM = 141; -const int ID_COMBO_SEL_STR = 142; -const int ID_COMBO_CLEAR = 143; -const int ID_COMBO_APPEND = 144; -const int ID_COMBO_DELETE = 145; -const int ID_COMBO_FONT = 146; -const int ID_COMBO_ENABLE = 147; -const int ID_COMBO_SET_TEXT = 148; - -const int ID_RADIOBOX = 160; -const int ID_RADIOBOX_SEL_NUM = 161; -const int ID_RADIOBOX_SEL_STR = 162; -const int ID_RADIOBOX_FONT = 163; -const int ID_RADIOBOX_ENABLE = 164; -const int ID_RADIOBOX2 = 165; -const int ID_RADIOBUTTON_1 = 166; -const int ID_RADIOBUTTON_2 = 167; - -const int ID_SET_FONT = 170; - -#if wxUSE_SLIDER -const int ID_SLIDER = 181; -#endif // wxUSE_SLIDER - -const int ID_SPIN = 182; -#if wxUSE_PROGRESSDLG -const int ID_BTNPROGRESS = 183; -#endif // wxUSE_PROGRESSDLG -const int ID_BUTTON_LABEL = 184; -const int ID_SPINCTRL = 185; -const int ID_BTNNEWTEXT = 186; - -const int ID_BUTTON_TEST1 = 190; -const int ID_BUTTON_TEST2 = 191; -const int ID_BITMAP_BTN = 192; -const int ID_BITMAP_BTN_ENABLE = 193; - -const int ID_CHANGE_COLOUR = 200; - -const int ID_SIZER_CHECK1 = 201; -const int ID_SIZER_CHECK2 = 202; -const int ID_SIZER_CHECK3 = 203; -const int ID_SIZER_CHECK4 = 204; -const int ID_SIZER_CHECK14 = 205; -const int ID_SIZER_CHECKBIG = 206; - -const int ID_SPIN_TEXT = 301; -const int ID_CHANGE_CHECK = 302; - -wxBEGIN_EVENT_TABLE(MyPanel, wxPanel) -EVT_IDLE ( MyPanel::OnIdle) -EVT_BOOKCTRL_PAGE_CHANGING(ID_BOOK, MyPanel::OnPageChanging) -EVT_BOOKCTRL_PAGE_CHANGED(ID_BOOK, MyPanel::OnPageChanged) -EVT_LISTBOX (ID_LISTBOX, MyPanel::OnListBox) -EVT_LISTBOX (ID_LISTBOX_SORTED, MyPanel::OnListBox) -EVT_LISTBOX_DCLICK(ID_LISTBOX, MyPanel::OnListBoxDoubleClick) -EVT_BUTTON (ID_LISTBOX_SEL_NUM, MyPanel::OnListBoxButtons) -EVT_BUTTON (ID_LISTBOX_SEL_STR, MyPanel::OnListBoxButtons) -EVT_BUTTON (ID_LISTBOX_CLEAR, MyPanel::OnListBoxButtons) -EVT_BUTTON (ID_LISTBOX_APPEND, MyPanel::OnListBoxButtons) -EVT_BUTTON (ID_LISTBOX_DELETE, MyPanel::OnListBoxButtons) -EVT_BUTTON (ID_LISTBOX_FONT, MyPanel::OnListBoxButtons) -EVT_CHECKBOX (ID_LISTBOX_ENABLE, MyPanel::OnListBoxButtons) -#if wxUSE_CHOICE -EVT_CHOICE (ID_CHOICE, MyPanel::OnChoice) -EVT_CHOICE (ID_CHOICE_SORTED, MyPanel::OnChoice) -EVT_BUTTON (ID_CHOICE_SEL_NUM, MyPanel::OnChoiceButtons) -EVT_BUTTON (ID_CHOICE_SEL_STR, MyPanel::OnChoiceButtons) -EVT_BUTTON (ID_CHOICE_CLEAR, MyPanel::OnChoiceButtons) -EVT_BUTTON (ID_CHOICE_APPEND, MyPanel::OnChoiceButtons) -EVT_BUTTON (ID_CHOICE_DELETE, MyPanel::OnChoiceButtons) -EVT_BUTTON (ID_CHOICE_FONT, MyPanel::OnChoiceButtons) -EVT_CHECKBOX (ID_CHOICE_ENABLE, MyPanel::OnChoiceButtons) -#endif -EVT_COMBOBOX (ID_COMBO, MyPanel::OnCombo) -EVT_TEXT (ID_COMBO, MyPanel::OnComboTextChanged) -EVT_TEXT_ENTER(ID_COMBO, MyPanel::OnComboTextEnter) -EVT_BUTTON (ID_COMBO_SEL_NUM, MyPanel::OnComboButtons) -EVT_BUTTON (ID_COMBO_SEL_STR, MyPanel::OnComboButtons) -EVT_BUTTON (ID_COMBO_CLEAR, MyPanel::OnComboButtons) -EVT_BUTTON (ID_COMBO_APPEND, MyPanel::OnComboButtons) -EVT_BUTTON (ID_COMBO_DELETE, MyPanel::OnComboButtons) -EVT_BUTTON (ID_COMBO_FONT, MyPanel::OnComboButtons) -EVT_BUTTON (ID_COMBO_SET_TEXT, MyPanel::OnComboButtons) -EVT_CHECKBOX (ID_COMBO_ENABLE, MyPanel::OnComboButtons) -EVT_RADIOBOX (ID_RADIOBOX, MyPanel::OnRadio) -EVT_RADIOBOX (ID_RADIOBOX2, MyPanel::OnRadio) -EVT_BUTTON (ID_RADIOBOX_SEL_NUM, MyPanel::OnRadioButtons) -EVT_BUTTON (ID_RADIOBOX_SEL_STR, MyPanel::OnRadioButtons) -EVT_BUTTON (ID_RADIOBOX_FONT, MyPanel::OnRadioButtons) -EVT_CHECKBOX (ID_RADIOBOX_ENABLE, MyPanel::OnRadioButtons) -EVT_RADIOBUTTON(ID_RADIOBUTTON_1, MyPanel::OnRadioButton1) -EVT_RADIOBUTTON(ID_RADIOBUTTON_2, MyPanel::OnRadioButton2) -EVT_BUTTON (ID_SET_FONT, MyPanel::OnSetFont) -#if wxUSE_SLIDER -EVT_SLIDER (ID_SLIDER, MyPanel::OnSliderUpdate) -#endif // wxUSE_SLIDER -#if wxUSE_SPINBTN -EVT_SPIN (ID_SPIN, MyPanel::OnSpinUpdate) -EVT_SPIN_UP (ID_SPIN, MyPanel::OnSpinUp) -EVT_SPIN_DOWN (ID_SPIN, MyPanel::OnSpinDown) -EVT_TEXT (ID_SPIN_TEXT, MyPanel::OnSpinTextChanged) -EVT_TEXT_ENTER(ID_SPIN_TEXT, MyPanel::OnSpinTextEnter) -#if wxUSE_PROGRESSDLG -EVT_UPDATE_UI (ID_BTNPROGRESS, MyPanel::OnUpdateShowProgress) -EVT_BUTTON (ID_BTNPROGRESS, MyPanel::OnShowProgress) -#endif // wxUSE_PROGRESSDLG -#endif // wxUSE_SPINBTN -#if wxUSE_SPINCTRL -EVT_SPINCTRL (ID_SPINCTRL, MyPanel::OnSpinCtrl) -EVT_SPIN_UP (ID_SPINCTRL, MyPanel::OnSpinCtrlUp) -EVT_SPIN_DOWN (ID_SPINCTRL, MyPanel::OnSpinCtrlDown) -EVT_TEXT (ID_SPINCTRL, MyPanel::OnSpinCtrlText) -#endif // wxUSE_SPINCTRL -EVT_BUTTON (ID_BTNNEWTEXT, MyPanel::OnNewText) -EVT_TOGGLEBUTTON(ID_BUTTON_LABEL, MyPanel::OnUpdateLabel) -EVT_CHECKBOX (ID_CHANGE_COLOUR, MyPanel::OnChangeColour) -EVT_CHECKBOX (ID_CHANGE_CHECK, MyPanel::OnChangeCheck) -EVT_BUTTON (ID_BUTTON_TEST1, MyPanel::OnTestButton) -EVT_BUTTON (ID_BUTTON_TEST2, MyPanel::OnTestButton) -EVT_BUTTON (ID_BITMAP_BTN, MyPanel::OnBmpButton) -EVT_TOGGLEBUTTON(ID_BITMAP_BTN_ENABLE, MyPanel::OnBmpButtonToggle) - -EVT_CHECKBOX (ID_SIZER_CHECK1, MyPanel::OnSizerCheck) -EVT_CHECKBOX (ID_SIZER_CHECK2, MyPanel::OnSizerCheck) -EVT_CHECKBOX (ID_SIZER_CHECK3, MyPanel::OnSizerCheck) -EVT_CHECKBOX (ID_SIZER_CHECK4, MyPanel::OnSizerCheck) -EVT_CHECKBOX (ID_SIZER_CHECK14, MyPanel::OnSizerCheck) -EVT_CHECKBOX (ID_SIZER_CHECKBIG, MyPanel::OnSizerCheck) - -wxEND_EVENT_TABLE() - -wxBEGIN_EVENT_TABLE(MyButton, wxButton) - EVT_LEFT_DCLICK(MyButton::OnDClick) -wxEND_EVENT_TABLE() - -wxBEGIN_EVENT_TABLE(MyComboBox, wxComboBox) - EVT_CHAR(MyComboBox::OnChar) - EVT_KEY_DOWN(MyComboBox::OnKeyDown) - EVT_KEY_UP(MyComboBox::OnKeyUp) - - EVT_SET_FOCUS(MyComboBox::OnFocusGot) -wxEND_EVENT_TABLE() - -wxBEGIN_EVENT_TABLE(MyRadioBox, wxRadioBox) - EVT_SET_FOCUS(MyRadioBox::OnFocusGot) - EVT_KILL_FOCUS(MyRadioBox::OnFocusLost) -wxEND_EVENT_TABLE() - -wxBEGIN_EVENT_TABLE(MyChoice, wxChoice) - EVT_SET_FOCUS(MyChoice::OnFocusGot) - EVT_KILL_FOCUS(MyChoice::OnFocusLost) -wxEND_EVENT_TABLE() - -// ============================================================================ -// implementation -// ============================================================================ - -MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) - : wxPanel( frame, wxID_ANY, wxPoint(x, y), wxSize(w, h) ) -{ - m_listbox = NULL; - m_listboxSorted = NULL; -#if wxUSE_CHOICE - m_choice = NULL; - m_choiceSorted = NULL; -#endif // wxUSE_CHOICE - m_combo = NULL; - m_radio = NULL; -#if wxUSE_GAUGE - m_gauge = NULL; - m_gaugeVert = NULL; -#endif // wxUSE_GAUGE -#if wxUSE_SLIDER - m_slider = NULL; -#endif // wxUSE_SLIDER - m_fontButton = NULL; - m_lbSelectNum = NULL; - m_lbSelectThis = NULL; -#if wxUSE_SPINBTN - m_spinbutton = NULL; -#if wxUSE_PROGRESSDLG - m_btnProgress = NULL; -#endif // wxUSE_PROGRESSDLG -#endif // wxUSE_SPINBTN -#if wxUSE_SPINCTRL - m_spinctrl = NULL; -#endif // wxUSE_SPINCTRL - m_spintext = NULL; - m_checkbox = NULL; - m_text = NULL; - m_book = NULL; - m_label = NULL; - - m_text = new wxTextCtrl(this, wxID_ANY, wxT("This is the log window.\n"), - wxPoint(0, 250), wxSize(100, 50), wxTE_MULTILINE); - - m_logTargetOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_text)); - - // use default position and size (will be recalculated automatically) - m_book = new wxBookCtrl(this, ID_BOOK); - - wxString choices[] = - { - wxT("This"), - wxT("is"), - wxT("one of my long and"), - wxT("wonderful"), - wxT("examples.") - }; - -#ifndef __WXMSW__ - // image ids - enum - { - Image_List, - Image_Choice, - Image_Combo, - Image_Text, - Image_Radio, -#if wxUSE_GAUGE - Image_Gauge, -#endif // wxUSE_GAUGE - Image_Max - }; - - // fill the image list - wxBitmap bmp(list_xpm); - - wxImageList *imagelist = new wxImageList(bmp.GetWidth(), bmp.GetHeight()); - - imagelist-> Add( bmp ); - imagelist-> Add( wxBitmap( choice_xpm )); - imagelist-> Add( wxBitmap( combo_xpm )); - imagelist-> Add( wxBitmap( text_xpm )); - imagelist-> Add( wxBitmap( radio_xpm )); -#if wxUSE_GAUGE - imagelist-> Add( wxBitmap( gauge_xpm )); -#endif // wxUSE_GAUGE - m_book->SetImageList(imagelist); -#else - // load images from resources - enum - { - Image_List, - Image_Choice, - Image_Combo, - Image_Text, - Image_Radio, -#if wxUSE_GAUGE - Image_Gauge, -#endif // wxUSE_GAUGE - Image_Max - }; - wxImageList *imagelist = new wxImageList(16, 16, false, Image_Max); - - static const wxChar *s_iconNames[Image_Max] = - { - wxT("list") - , wxT("choice") - , wxT("combo") - , wxT("text") - , wxT("radio") -#if wxUSE_GAUGE - , wxT("gauge") -#endif // wxUSE_GAUGE - }; - - for ( size_t n = 0; n < Image_Max; n++ ) - { - wxBitmap bmp(s_iconNames[n]); - if ( !bmp.IsOk() || (imagelist->Add(bmp) == -1) ) - { - wxLogWarning(wxT("Couldn't load the image '%s' for the book control page %d."), - s_iconNames[n], n); - } - } - - m_book->SetImageList(imagelist); -#endif - - // ------------------------------------------------------------------------ - // listbox page - // ------------------------------------------------------------------------ - wxPanel *panel = new wxPanel(m_book); - m_listbox = new wxCheckListBox( panel, ID_LISTBOX, - wxPoint(10,10), wxSize(120,70), - 5, choices, wxLB_MULTIPLE | wxLB_ALWAYS_SB | wxHSCROLL ); - m_listboxSorted = new wxCheckListBox( panel, ID_LISTBOX_SORTED, - wxPoint(10,90), wxSize(120,70), - 3, choices, wxLB_SORT ); - - SetListboxClientData(wxT("listbox"), m_listbox); - SetListboxClientData(wxT("listbox"), m_listboxSorted); - - m_listbox->SetCursor(*wxCROSS_CURSOR); - - m_lbSelectNum = new wxButton( panel, ID_LISTBOX_SEL_NUM, wxT("Select #&2"), wxPoint(180,30), wxSize(140,30) ); - m_lbSelectThis = new wxButton( panel, ID_LISTBOX_SEL_STR, wxT("&Select 'This'"), wxPoint(340,30), wxSize(140,30) ); - (void)new wxButton( panel, ID_LISTBOX_CLEAR, wxT("&Clear"), wxPoint(180,80), wxSize(140,30) ); - (void)new MyButton( panel, ID_LISTBOX_APPEND, wxT("&Append 'Hi!'"), wxPoint(340,80), wxSize(140,30) ); - (void)new wxButton( panel, ID_LISTBOX_DELETE, wxT("D&elete selected item"), wxPoint(180,130), wxSize(140,30) ); - wxButton *button = new MyButton( panel, ID_LISTBOX_FONT, wxT("Set &Italic font"), wxPoint(340,130), wxSize(140,30) ); - - button->SetDefault(); - - m_checkbox = new wxCheckBox( panel, ID_LISTBOX_ENABLE, wxT("&Disable"), wxPoint(20,170) ); - m_checkbox->SetValue(false); - button->MoveAfterInTabOrder(m_checkbox); - (void)new wxCheckBox( panel, ID_CHANGE_COLOUR, wxT("&Toggle colour"), - wxPoint(110,170) ); - (void)new wxCheckBox( panel, ID_CHANGE_CHECK, wxT("&Toggle check"), - wxPoint(270,170) ); - panel->SetCursor(wxCursor(wxCURSOR_HAND)); - m_book->AddPage(panel, wxT("wxCheckListBox"), true); - m_book->SetPageImage(0, Image_List); - wxASSERT_MSG(m_book->GetPageImage(m_book->GetPageCount()-1) == Image_List, "invalid imageId"); - //m_book->SetPageImage(0, -1); // remove the image to test wxQT - //m_book->RemovePage(0); // remove the page to test wxQT - - - // ------------------------------------------------------------------------ - // choice page - // ------------------------------------------------------------------------ -#if wxUSE_CHOICE - panel = new wxPanel(m_book); - m_choice = new MyChoice( panel, ID_CHOICE, wxPoint(10,10), wxDefaultSize, 5, choices ); - m_choiceSorted = new MyChoice( panel, ID_CHOICE_SORTED, wxPoint(10,70), wxSize(120,wxDefaultCoord), - 5, choices, wxCB_SORT ); - - SetChoiceClientData(wxT("choice"), m_choice); - SetChoiceClientData(wxT("choice"), m_choiceSorted); - - m_choice->SetSelection(2); - (void)new wxButton( panel, ID_CHOICE_SEL_NUM, wxT("Select #&2"), wxPoint(220,30), wxSize(140,30) ); - (void)new wxButton( panel, ID_CHOICE_SEL_STR, wxT("&Select 'This'"), wxPoint(380,30), wxSize(140,30) ); - (void)new wxButton( panel, ID_CHOICE_CLEAR, wxT("&Clear"), wxPoint(220,80), wxSize(140,30) ); - (void)new wxButton( panel, ID_CHOICE_APPEND, wxT("&Append 'Hi!'"), wxPoint(380,80), wxSize(140,30) ); - (void)new wxButton( panel, ID_CHOICE_DELETE, wxT("D&elete selected item"), wxPoint(220,130), wxSize(140,30) ); - (void)new wxButton( panel, ID_CHOICE_FONT, wxT("Set &Italic font"), wxPoint(380,130), wxSize(140,30) ); - (void)new wxCheckBox( panel, ID_CHOICE_ENABLE, wxT("&Disable"), wxPoint(20,130), wxSize(140,30) ); - - m_book->AddPage(panel, wxT("wxChoice"), false, Image_Choice); - wxASSERT_MSG(m_book->GetPageImage(m_book->GetPageCount()-1) == Image_Choice, "invalid imageId"); - -#endif // wxUSE_CHOICE - - // ------------------------------------------------------------------------ - // combo page - // ------------------------------------------------------------------------ - panel = new wxPanel(m_book); - m_combo = new MyComboBox( panel, ID_COMBO, wxT("This"), - wxPoint(15,25), wxDefaultSize, - 5, choices, - wxTE_PROCESS_ENTER); - - wxASSERT_MSG(!m_combo->GetString(2).IsNull(), "Invalid item not null"); - - wxSize combosize(m_combo->GetBestSize().x + 20, 100); - (void)new wxStaticBox( panel, wxID_ANY, wxT("&Box around combobox"), - wxPoint(5, 5), combosize); -#ifdef __WXQT__ - m_combo->Raise(); -#endif - (void)new wxButton( panel, ID_COMBO_SEL_NUM, wxT("Select #&2"), wxPoint(220,30), wxSize(140,30) ); - (void)new wxButton( panel, ID_COMBO_SEL_STR, wxT("&Select 'This'"), wxPoint(380,30), wxSize(140,30) ); - (void)new wxButton( panel, ID_COMBO_CLEAR, wxT("&Clear"), wxPoint(220,80), wxSize(140,30) ); - (void)new wxButton( panel, ID_COMBO_APPEND, wxT("&Append 'Hi!'"), wxPoint(380,80), wxSize(140,30) ); - (void)new wxButton( panel, ID_COMBO_DELETE, wxT("D&elete selected item"), wxPoint(220,130), wxSize(140,30) ); - (void)new wxButton( panel, ID_COMBO_FONT, wxT("Set &Italic font"), wxPoint(380,130), wxSize(140,30) ); - (void)new wxButton( panel, ID_COMBO_SET_TEXT, wxT("Set 'Hi!' at #2"), wxPoint(380,180), wxSize(140,30) ); - (void)new wxCheckBox( panel, ID_COMBO_ENABLE, wxT("&Disable"), wxPoint(20,130), wxSize(140,30) ); - m_book->AddPage(panel, wxT("wxComboBox"), false, Image_Combo); - wxASSERT_MSG(m_book->GetPageImage(m_book->GetPageCount()-1) == Image_Combo, "invalid imageId"); - - // ------------------------------------------------------------------------ - // radio box - // ------------------------------------------------------------------------ - wxString choices2[] = - { - wxT("First"), wxT("Second"), - /* "Third", - "Fourth", "Fifth", "Sixth", - "Seventh", "Eighth", "Nineth", "Tenth" */ - }; - - panel = new wxPanel(m_book); - wxGridBagSizer* radio_page_sizer = new wxGridBagSizer(5, 5); - - m_radio = new wxRadioBox(panel, ID_RADIOBOX, wxT("T&his"), - wxPoint(10,10), wxDefaultSize, - WXSIZEOF(choices), choices, - 1, wxRA_SPECIFY_COLS ); - MyRadioBox* mybox = new MyRadioBox(panel, ID_RADIOBOX2, wxT("&That"), - wxPoint(10,160), wxDefaultSize, - WXSIZEOF(choices2), choices2, - 1, wxRA_SPECIFY_ROWS ); - - radio_page_sizer->Add( m_radio, wxGBPosition(0,0), wxGBSpan(2,1) ); - radio_page_sizer->Add( mybox, wxGBPosition(2,0), wxGBSpan(2,1) ); - -#if wxUSE_HELP - for (unsigned int item = 0; item < WXSIZEOF(choices); ++item) - m_radio->SetItemHelpText( item, wxString::Format( wxT("Help text for \"%s\""), - choices[item].c_str() ) ); - - // erase help text for the second item - m_radio->SetItemHelpText( 1, wxT("") ); - // set default help text for control - m_radio->SetHelpText( wxT("Default helptext for wxRadioBox") ); -#endif // wxUSE_HELP - - wxButton* select_two = new wxButton ( panel, ID_RADIOBOX_SEL_NUM, wxT("Select #&2") ); - wxButton* select_this = new wxButton ( panel, ID_RADIOBOX_SEL_STR, wxT("&Select 'This'") ); - m_fontButton = new wxButton ( panel, ID_SET_FONT, wxT("Set &more Italic font") ); - wxButton* set_italic = new wxButton ( panel, ID_RADIOBOX_FONT, wxT("Set &Italic font") ); - wxCheckBox* disable_cb = new wxCheckBox( panel, ID_RADIOBOX_ENABLE, wxT("&Disable") ); - wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, wxT("Radiobutton1"), - wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); - wxRadioButton *rb2 = new wxRadioButton( panel, ID_RADIOBUTTON_2, wxT("&Radiobutton2"), - wxDefaultPosition, wxDefaultSize ); - rb->SetValue( false ); - - radio_page_sizer->Add( select_two, wxGBPosition(0, 1), wxDefaultSpan, wxALL , 10 ); - radio_page_sizer->Add( select_this, wxGBPosition(1, 1), wxDefaultSpan, wxALL , 10 ); - radio_page_sizer->Add( m_fontButton, wxGBPosition(0, 2), wxDefaultSpan, wxALL , 10 ); - radio_page_sizer->Add( set_italic, wxGBPosition(1, 2), wxDefaultSpan, wxALL , 10 ); - radio_page_sizer->Add( disable_cb, wxGBPosition(2, 2), wxDefaultSpan, wxLEFT | wxRIGHT, 10 ); - radio_page_sizer->Add( rb, wxGBPosition(3, 1), wxDefaultSpan, wxLEFT | wxRIGHT, 10 ); - radio_page_sizer->Add( rb2, wxGBPosition(3, 2), wxDefaultSpan, wxLEFT | wxRIGHT, 10 ); - - panel->SetSizer( radio_page_sizer ); - - m_book->AddPage(panel, wxT("wxRadioBox"), false, Image_Radio); - - // ------------------------------------------------------------------------ - // gauge and slider - // ------------------------------------------------------------------------ - -#if wxUSE_SLIDER && wxUSE_GAUGE - panel = new wxPanel(m_book); - - wxBoxSizer *gauge_page_vsizer = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer *gauge_page_first_row_sizer = new wxBoxSizer( wxHORIZONTAL ); - - wxStaticBoxSizer *gauge_sizer = new wxStaticBoxSizer( wxHORIZONTAL, panel, wxT("&wxGauge and wxSlider") ); - gauge_page_first_row_sizer->Add( gauge_sizer, 0, wxALL, 5 ); - wxBoxSizer *sz = new wxBoxSizer( wxVERTICAL ); - gauge_sizer->Add( sz ); - m_gauge = new wxGauge( panel, wxID_ANY, 200, wxDefaultPosition, wxSize(155, 30), wxGA_HORIZONTAL|wxNO_BORDER|wxGA_TEXT ); - sz->Add( m_gauge, 0, wxALL, 10 ); - m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200, - wxDefaultPosition, wxSize(155,wxDefaultCoord), - wxSL_AUTOTICKS | wxSL_LABELS); - m_slider->SetTickFreq(40); - sz->Add( m_slider, 0, wxALL, 10 ); - - m_gaugeVert = new wxGauge( panel, wxID_ANY, 100, - wxDefaultPosition, wxSize(wxDefaultCoord, 90), - wxGA_VERTICAL | wxGA_SMOOTH | wxNO_BORDER ); - gauge_sizer->Add( m_gaugeVert, 0, wxALL, 10 ); - - - - wxStaticBox *sb = new wxStaticBox( panel, wxID_ANY, wxT("&Explanation"), - wxDefaultPosition, wxDefaultSize ); //, wxALIGN_CENTER ); - wxStaticBoxSizer *wrapping_sizer = new wxStaticBoxSizer( sb, wxVERTICAL ); - gauge_page_first_row_sizer->Add( wrapping_sizer, 0, wxALL, 5 ); - -#ifdef __WXMOTIF__ - // No wrapping text in wxStaticText yet :-( - m_wrappingText = new wxStaticText( panel, wxID_ANY, - wxT("Drag the slider!"), - wxPoint(250,30), - wxSize(240, wxDefaultCoord) - ); -#else - m_wrappingText = new wxStaticText( panel, wxID_ANY, - wxT("In order see the gauge (aka progress bar) ") - wxT("control do something you have to drag the ") - wxT("handle of the slider to the right.") - wxT("\n\n") - wxT("This is also supposed to demonstrate how ") - wxT("to use static controls with line wrapping."), - wxDefaultPosition, - wxSize(240, wxDefaultCoord) - ); -#endif - wrapping_sizer->Add( m_wrappingText ); - - wxStaticBoxSizer *non_wrapping_sizer = new wxStaticBoxSizer( wxVERTICAL, panel, wxT("Non-wrapping") ); - gauge_page_first_row_sizer->Add( non_wrapping_sizer, 0, wxALL, 5 ); - - m_nonWrappingText = new wxStaticText( panel, wxID_ANY, - wxT("This static text has two lines.\nThey do not wrap."), - wxDefaultPosition, - wxDefaultSize - ); - non_wrapping_sizer->Add( m_nonWrappingText ); - - gauge_page_vsizer->Add( gauge_page_first_row_sizer, 1 ); - wxBoxSizer *gauge_page_second_row_sizer = new wxBoxSizer( wxHORIZONTAL ); - - - int initialSpinValue = -5; - wxString s; - s << initialSpinValue; - m_spintext = new wxTextCtrl( panel, ID_SPIN_TEXT, s ); - gauge_page_second_row_sizer->Add( m_spintext, 0, wxALL, 5 ); - -#if wxUSE_SPINBTN - m_spinbutton = new wxSpinButton( panel, ID_SPIN ); - m_spinbutton->SetRange(-40,30); - m_spinbutton->SetValue(initialSpinValue); - gauge_page_second_row_sizer->Add( m_spinbutton, 0, wxALL, 5 ); -#endif // wxUSE_SPINBTN - -#if wxUSE_SPINCTRL - m_spinctrl = new wxSpinCtrl( panel, ID_SPINCTRL, wxEmptyString ); - m_spinctrl->SetRange(-10,30); - m_spinctrl->SetValue(15); - m_spinctrl->SetValue("20"); - gauge_page_second_row_sizer->Add( m_spinctrl, 0, wxALL, 5 ); -#endif // wxUSE_SPINCTRL - -#if wxUSE_SPINBTN -#if wxUSE_PROGRESSDLG - m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, wxT("&Show progress dialog") ); - gauge_page_second_row_sizer->Add( m_btnProgress, 0, wxALL, 5 ); -#endif // wxUSE_PROGRESSDLG -#endif // wxUSE_SPINBTN - - wxButton* newTextButton = new wxButton( panel, ID_BTNNEWTEXT, wxT("New text")); - gauge_page_second_row_sizer->Add( newTextButton, 0, wxALL, 5 ); - - gauge_page_vsizer->Add(gauge_page_second_row_sizer, 1); - panel->SetSizer( gauge_page_vsizer ); - - m_book->AddPage(panel, wxT("wxGauge"), false, Image_Gauge); -#endif // wxUSE_SLIDER && wxUSE_GAUGE - - - // ------------------------------------------------------------------------ - // wxBitmapXXX - // ------------------------------------------------------------------------ - - panel = new wxPanel(m_book); - -#if !defined(__WXMOTIF__) // wxStaticBitmap not working under Motif yet. - wxIcon icon = wxArtProvider::GetIcon(wxART_INFORMATION); - (void) new wxStaticBitmap( panel, wxID_ANY, icon, wxPoint(10, 10) ); - - // VZ: don't leak memory - // bmpStatic = new wxStaticBitmap(panel, wxID_ANY, wxNullIcon, wxPoint(50, 10)); - // bmpStatic->SetIcon(wxArtProvider::GetIcon(wxART_QUESTION)); -#endif // !Motif - - wxBitmap bitmap( 100, 100 ); - wxMemoryDC dc; - wxFont font; - font.SetFamily(wxFONTFAMILY_ROMAN); - font.SetPointSize(10); - dc.SelectObject( bitmap ); - dc.SetFont(font); - dc.SetBackground(*wxGREEN); - dc.SetPen(*wxRED_PEN); - dc.Clear(); - dc.DrawEllipse(5, 5, 90, 90); - dc.DrawText(wxT("Bitmap"), 30, 40); - dc.SelectObject( wxNullBitmap ); - - wxPanel *panel2 = new wxPanel(panel, -1, wxPoint(100, 0), wxSize(100, 200)); - (void)new wxBitmapButton(panel2, ID_BITMAP_BTN, bitmap, wxPoint(0, 20)); - (void)new wxToggleButton(panel2, ID_BITMAP_BTN_ENABLE, - wxT("Enable/disable &bitmap"), wxPoint(0, 140)); - -#if defined(__WXMSW__) || defined(__WXMOTIF__) - // test for masked bitmap display - bitmap = wxBitmap(wxT("test2.bmp"), wxBITMAP_TYPE_BMP); - if (bitmap.IsOk()) - { - bitmap.SetMask(new wxMask(bitmap, *wxBLUE)); - - (void)new wxStaticBitmap(panel, wxID_ANY, bitmap, wxPoint(300, 120)); - } -#endif - - wxBitmap bmp1(wxArtProvider::GetBitmap(wxART_INFORMATION)), - bmp2(wxArtProvider::GetBitmap(wxART_WARNING)), - bmp3(wxArtProvider::GetBitmap(wxART_QUESTION)); - wxBitmapButton *bmpBtn = new wxBitmapButton - ( - panel, wxID_ANY, - bmp1, - wxPoint(30, 70) - ); - - bmpBtn->SetBitmapSelected(bmp2); - bmpBtn->SetBitmapFocus(bmp3); - - (void)new wxToggleButton(panel, ID_BUTTON_LABEL, - wxT("&Toggle label"), wxPoint(250, 20)); - - m_label = new wxStaticText(panel, wxID_ANY, wxT("Label with some long text"), - wxPoint(250, 60), wxDefaultSize, - wxALIGN_RIGHT /*| wxST_NO_AUTORESIZE*/); - m_label->SetForegroundColour( *wxBLUE ); - - m_book->AddPage(panel, wxT("wxBitmapXXX")); - - // ------------------------------------------------------------------------ - // sizer page - // ------------------------------------------------------------------------ - - panel = new wxPanel(m_book); - - wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL ); - - wxStaticBoxSizer *csizer = - new wxStaticBoxSizer (new wxStaticBox (panel, wxID_ANY, wxT("Show Buttons")), wxHORIZONTAL ); - - wxCheckBox *check1, *check2, *check3, *check4, *check14, *checkBig; - check1 = new wxCheckBox (panel, ID_SIZER_CHECK1, wxT("1")); - check1->SetValue (true); - csizer->Add (check1); - check2 = new wxCheckBox (panel, ID_SIZER_CHECK2, wxT("2")); - check2->SetValue (true); - csizer->Add (check2); - check3 = new wxCheckBox (panel, ID_SIZER_CHECK3, wxT("3")); - check3->SetValue (true); - csizer->Add (check3); - check4 = new wxCheckBox (panel, ID_SIZER_CHECK4, wxT("4")); - check4->SetValue (true); - csizer->Add (check4); - check14 = new wxCheckBox (panel, ID_SIZER_CHECK14, wxT("1-4")); - check14->SetValue (true); - csizer->Add (check14); - checkBig = new wxCheckBox (panel, ID_SIZER_CHECKBIG, wxT("Big")); - checkBig->SetValue (true); - csizer->Add (checkBig); - - sizer->Add (csizer); - - m_hsizer = new wxBoxSizer( wxHORIZONTAL ); - - m_buttonSizer = new wxBoxSizer (wxVERTICAL); - - m_sizerBtn1 = new wxButton(panel, wxID_ANY, wxT("Test Button &1 (tab order 1)") ); - m_buttonSizer->Add( m_sizerBtn1, 0, wxALL, 10 ); - m_sizerBtn2 = new wxButton(panel, wxID_ANY, wxT("Test Button &2 (tab order 3)") ); - m_buttonSizer->Add( m_sizerBtn2, 0, wxALL, 10 ); - m_sizerBtn3 = new wxButton(panel, wxID_ANY, wxT("Test Button &3 (tab order 2)") ); - m_buttonSizer->Add( m_sizerBtn3, 0, wxALL, 10 ); - m_sizerBtn4 = new wxButton(panel, wxID_ANY, wxT("Test Button &4 (tab order 4)") ); - m_buttonSizer->Add( m_sizerBtn4, 0, wxALL, 10 ); - - m_sizerBtn3->MoveBeforeInTabOrder(m_sizerBtn2); - - m_hsizer->Add (m_buttonSizer); - m_hsizer->Add( 20,20, 1 ); - m_bigBtn = new wxButton(panel, wxID_ANY, wxT("Multiline\nbutton") ); - m_hsizer->Add( m_bigBtn , 3, wxGROW|wxALL, 10 ); - - sizer->Add (m_hsizer, 1, wxGROW); - - panel->SetSizer( sizer ); - - m_book->AddPage(panel, wxT("wxSizer")); - - // set the sizer for the panel itself - sizer = new wxBoxSizer(wxVERTICAL); - sizer->Add(m_book, wxSizerFlags().Border().Expand()); - sizer->Add(m_text, wxSizerFlags(1).Border().Expand()); - SetSizer(sizer); - -#if wxUSE_TOOLTIPS - SetAllToolTips(); -#endif // wxUSE_TOOLTIPS -} - -#if wxUSE_TOOLTIPS - -namespace -{ - -void ResetToolTip(wxWindow *win, const char *tip) -{ - wxCHECK_RET( win, "NULL window?" ); - - win->UnsetToolTip(); - win->SetToolTip(tip); -} - -} - -void MyPanel::SetAllToolTips() -{ - ResetToolTip(FindWindow(ID_LISTBOX_FONT), "Press here to set italic font"); - ResetToolTip(m_checkbox, "Click here to disable the listbox"); - ResetToolTip(m_listbox, "This is a list box"); - ResetToolTip(m_combo, "This is a natural\ncombobox - can you believe me?"); - ResetToolTip(m_slider, "This is a sliding slider"); - ResetToolTip(FindWindow(ID_RADIOBOX2), "Ever seen a radiobox?"); - - //ResetToolTip(m_radio, "Tooltip for the entire radiobox"); - for ( unsigned int nb = 0; nb < m_radio->GetCount(); nb++ ) - { - m_radio->SetItemToolTip(nb, ""); - m_radio->SetItemToolTip(nb, "tooltip for\n" + m_radio->GetString(nb)); - } - - // remove the tooltip for one of the items - m_radio->SetItemToolTip(2, ""); -} -#endif // wxUSE_TOOLTIPS - -void MyPanel::OnIdle(wxIdleEvent& event) -{ - static const int INVALID_SELECTION = -2; - - static int s_selCombo = INVALID_SELECTION; - - if (!m_combo || !m_choice) - { - event.Skip(); - return; - } - - int sel = m_combo->GetSelection(); - if ( sel != s_selCombo ) - { - if ( s_selCombo != INVALID_SELECTION ) - { - wxLogMessage(wxT("EVT_IDLE: combobox selection changed from %d to %d"), - s_selCombo, sel); - } - - s_selCombo = sel; - } - - static int s_selChoice = INVALID_SELECTION; - sel = m_choice->GetSelection(); - if ( sel != s_selChoice ) - { - if ( s_selChoice != INVALID_SELECTION ) - { - wxLogMessage(wxT("EVT_IDLE: choice selection changed from %d to %d"), - s_selChoice, sel); - } - - s_selChoice = sel; - } - - event.Skip(); -} - -void MyPanel::OnPageChanging( wxBookCtrlEvent &event ) -{ - int selOld = event.GetOldSelection(); - if ( selOld == 2 ) - { - if ( wxMessageBox(wxT("This demonstrates how a program may prevent the\n") - wxT("page change from taking place - if you select\n") - wxT("[No] the current page will stay the third one\n"), - wxT("Control sample"), - wxICON_QUESTION | wxYES_NO, this) != wxYES ) - { - event.Veto(); - - return; - } - } - - *m_text << wxT("Book selection is being changed from ") << selOld - << wxT(" to ") << event.GetSelection() - << wxT(" (current page from book is ") - << m_book->GetSelection() << wxT(")\n"); -} - -void MyPanel::OnPageChanged( wxBookCtrlEvent &event ) -{ - *m_text << wxT("Book selection is now ") << event.GetSelection() - << wxT(" (from book: ") << m_book->GetSelection() - << wxT(")\n"); -} - -void MyPanel::OnTestButton(wxCommandEvent& event) -{ - wxLogMessage(wxT("Button %c clicked."), - event.GetId() == ID_BUTTON_TEST1 ? wxT('1') : wxT('2')); -} - -void MyPanel::OnBmpButton(wxCommandEvent& WXUNUSED(event)) -{ - wxLogMessage(wxT("Bitmap button clicked.")); -} - -void MyPanel::OnBmpButtonToggle(wxCommandEvent& event) -{ - FindWindow(ID_BITMAP_BTN)->Enable(!event.IsChecked()); -} - -void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event)) -{ - static wxColour s_colOld; - - SetThemeEnabled(false); - // test panel colour changing and propagation to the subcontrols - if ( s_colOld.IsOk() ) - { - SetBackgroundColour(s_colOld); - s_colOld = wxNullColour; - - m_lbSelectThis->SetForegroundColour(wxNullColour); - m_lbSelectThis->SetBackgroundColour(wxNullColour); - } - else - { - s_colOld = *wxRED; - SetBackgroundColour(*wxWHITE); - - m_lbSelectThis->SetForegroundColour(wxT("white")); - m_lbSelectThis->SetBackgroundColour(wxT("red")); - } - - m_lbSelectThis->Refresh(); - Refresh(); -} - -void MyPanel::OnChangeCheck(wxCommandEvent& event) -{ - // check/uncheck all the items in the wxCheckListBox - for (unsigned int n=0; n < m_listbox->GetCount(); n++) { - m_listbox->Check(n, event.GetInt() != 0); - } -} - -void MyPanel::OnListBox( wxCommandEvent &event ) -{ - wxCheckListBox *listbox = event.GetId() == ID_LISTBOX ? m_listbox - : m_listboxSorted; - - bool deselect = false; - if (listbox->HasFlag(wxLB_MULTIPLE) || listbox->HasFlag(wxLB_EXTENDED)) - { - deselect = !event.IsSelection(); - if (deselect) - m_text->AppendText( wxT("ListBox deselection event\n") ); - } - - m_text->AppendText( wxT("ListBox event selection string is: '") ); - m_text->AppendText( event.GetString() ); - m_text->AppendText( wxT("'\n") ); - - // can't use GetStringSelection() with multiple selections, there could be - // more than one of them - if ( !listbox->HasFlag(wxLB_MULTIPLE) && !listbox->HasFlag(wxLB_EXTENDED) ) - { - m_text->AppendText( wxT("ListBox control selection string is: '") ); - m_text->AppendText( listbox->GetStringSelection() ); - m_text->AppendText( wxT("'\n") ); - } - - wxStringClientData *obj = ((wxStringClientData *)event.GetClientObject()); - m_text->AppendText( wxT("ListBox event client data string is: '") ); - if (obj) // BC++ doesn't like use of '? .. : .. ' in this context - m_text->AppendText( obj->GetData() ); - else - m_text->AppendText( wxString(wxT("none")) ); - - m_text->AppendText( wxT("'\n") ); - m_text->AppendText( wxT("ListBox control client data string is: '") ); - obj = (wxStringClientData *)listbox->GetClientObject(event.GetInt()); - if (obj) - m_text->AppendText( obj->GetData() ); - else - m_text->AppendText( wxString(wxT("none")) ); - m_text->AppendText( wxT("'\n") ); - - if (listbox->IsChecked(event.GetInt())) - m_text->AppendText( "Item checked \n" ); - else - m_text->AppendText( "Item unchecked \n" ); -} - -void MyPanel::OnListBoxDoubleClick( wxCommandEvent &event ) -{ - m_text->AppendText( wxT("ListBox double click string is: ") ); - m_text->AppendText( event.GetString() ); - m_text->AppendText( wxT("\n") ); -} - -void MyPanel::OnListBoxButtons( wxCommandEvent &event ) -{ - switch (event.GetId()) - { - case ID_LISTBOX_ENABLE: - { - m_text->AppendText(wxT("Checkbox clicked.\n")); -#if wxUSE_TOOLTIPS - wxCheckBox *cb = (wxCheckBox*)event.GetEventObject(); - if (event.GetInt()) - cb->SetToolTip( wxT("Click to enable listbox") ); - else - cb->SetToolTip( wxT("Click to disable listbox") ); -#endif // wxUSE_TOOLTIPS - m_listbox->Enable( event.GetInt() == 0 ); - m_lbSelectThis->Enable( event.GetInt() == 0 ); - m_lbSelectNum->Enable( event.GetInt() == 0 ); - m_listboxSorted->Enable( event.GetInt() == 0 ); - FindWindow(ID_CHANGE_COLOUR)->Enable( event.GetInt() == 0 ); - break; - } - case ID_LISTBOX_SEL_NUM: - { - if (m_listbox->GetCount() > 2) - m_listbox->SetSelection( 2 ); - if (m_listboxSorted->GetCount() > 2) - m_listboxSorted->SetSelection( 2 ); - m_lbSelectThis->WarpPointer( 40, 14 ); - break; - } - case ID_LISTBOX_SEL_STR: - { - if (m_listbox->FindString(wxT("This")) != wxNOT_FOUND) - m_listbox->SetStringSelection( wxT("This") ); - if (m_listboxSorted->FindString(wxT("This")) != wxNOT_FOUND) - m_listboxSorted->SetStringSelection( wxT("This") ); - m_lbSelectNum->WarpPointer( 40, 14 ); - break; - } - case ID_LISTBOX_CLEAR: - { - m_listbox->Clear(); - m_listboxSorted->Clear(); - break; - } - case ID_LISTBOX_APPEND: - { - m_listbox->Append( wxT("Hi kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk!") ); - m_listboxSorted->Append( wxT("Hi hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh!") ); - break; - } - case ID_LISTBOX_DELETE: - { - int idx; - idx = m_listbox->GetSelection(); - if ( idx != wxNOT_FOUND ) - m_listbox->Delete( idx ); - idx = m_listboxSorted->GetSelection(); - if ( idx != wxNOT_FOUND ) - m_listboxSorted->Delete( idx ); - break; - } - case ID_LISTBOX_FONT: - { - m_listbox->SetFont( *wxITALIC_FONT ); - m_listboxSorted->SetFont( *wxITALIC_FONT ); - m_checkbox->SetFont( *wxITALIC_FONT ); - break; - } - } -} - -#if wxUSE_CHOICE - -static wxString GetDataString(wxClientData *data) -{ - return data ? static_cast(data)->GetData() - : wxString("none"); -} - -void MyPanel::OnChoice( wxCommandEvent &event ) -{ - wxChoice *choice = event.GetId() == ID_CHOICE ? m_choice - : m_choiceSorted; - - const int sel = choice->GetSelection(); - - wxClientData *dataEvt = event.GetClientObject(), - *dataCtrl = choice->GetClientObject(sel); - - wxLogMessage(wxT("EVT_CHOICE: item %d/%d (event/control), ") - wxT("string \"%s\"/\"%s\", ") - wxT("data \"%s\"/\"%s\""), - (int)event.GetInt(), - sel, - event.GetString(), - choice->GetStringSelection(), - GetDataString(dataEvt), - GetDataString(dataCtrl)); -} - -void MyPanel::OnChoiceButtons( wxCommandEvent &event ) -{ - switch (event.GetId()) - { - case ID_CHOICE_ENABLE: - { - m_choice->Enable( event.GetInt() == 0 ); - m_choiceSorted->Enable( event.GetInt() == 0 ); - break; - } - case ID_CHOICE_SEL_NUM: - { - m_choice->SetSelection( 2 ); - m_choiceSorted->SetSelection( 2 ); - break; - } - case ID_CHOICE_SEL_STR: - { - m_choice->SetStringSelection( wxT("This") ); - m_choiceSorted->SetStringSelection( wxT("This") ); - break; - } - case ID_CHOICE_CLEAR: - { - m_choice->Clear(); - m_choiceSorted->Clear(); - break; - } - case ID_CHOICE_APPEND: - { - m_choice->Append( wxT("Hi!") ); - m_choiceSorted->Append( wxT("Hi!") ); - break; - } - case ID_CHOICE_DELETE: - { - int idx = m_choice->GetSelection(); - if ( idx != wxNOT_FOUND ) - m_choice->Delete( idx ); - idx = m_choiceSorted->GetSelection(); - if ( idx != wxNOT_FOUND ) - m_choiceSorted->Delete( idx ); - break; - } - case ID_CHOICE_FONT: - { - m_choice->SetFont( *wxITALIC_FONT ); - m_choiceSorted->SetFont( *wxITALIC_FONT ); - break; - } - } -} -#endif // wxUSE_CHOICE - -void MyPanel::OnCombo( wxCommandEvent &event ) -{ - if (!m_combo) - return; - - wxLogMessage(wxT("EVT_COMBOBOX: item %d/%d (event/control), string \"%s\"/\"%s\""), - (int)event.GetInt(), - m_combo->GetSelection(), - event.GetString().c_str(), - m_combo->GetStringSelection().c_str()); -} - -void MyPanel::OnComboTextChanged(wxCommandEvent& event) -{ - if (m_combo) - { - wxLogMessage(wxT("EVT_TEXT for the combobox: \"%s\" (event) or \"%s\" (control)."), - event.GetString().c_str(), - m_combo->GetValue().c_str()); - } -} - -void MyPanel::OnComboTextEnter(wxCommandEvent& WXUNUSED(event)) -{ - if (m_combo) - { - wxLogMessage(wxT("Enter pressed in the combobox: value is '%s'."), - m_combo->GetValue().c_str()); - } -} - -void MyPanel::OnComboButtons( wxCommandEvent &event ) -{ - switch (event.GetId()) - { - case ID_COMBO_ENABLE: - { - m_combo->Enable( event.GetInt() == 0 ); - break; - } - case ID_COMBO_SEL_NUM: - { - m_combo->SetSelection( 2 ); - break; - } - case ID_COMBO_SEL_STR: - { - m_combo->SetStringSelection( wxT("This") ); - break; - } - case ID_COMBO_CLEAR: - { - m_combo->Clear(); - break; - } - case ID_COMBO_APPEND: - { - m_combo->Append( wxT("Hi!") ); - break; - } - case ID_COMBO_DELETE: - { - int idx = m_combo->GetSelection(); - m_combo->Delete( idx ); - break; - } - case ID_COMBO_FONT: - { - m_combo->SetFont( *wxITALIC_FONT ); - break; - } - case ID_COMBO_SET_TEXT: - { - m_combo->SetString( 2, wxT("Hi!") ); - break; - } - } -} - -void MyPanel::OnRadio( wxCommandEvent &event ) -{ - m_text->AppendText( wxT("RadioBox selection string is: ") ); - m_text->AppendText( event.GetString() ); - m_text->AppendText( wxT("\n") ); -} - -void MyPanel::OnRadioButton1( wxCommandEvent & WXUNUSED(event) ) -{ - wxMessageBox(wxT("First wxRadioButton selected."), wxT("wxControl sample")); -} - -void MyPanel::OnRadioButton2( wxCommandEvent & WXUNUSED(event) ) -{ - m_text->AppendText(wxT("Second wxRadioButton selected.\n")); -} - -void MyPanel::OnRadioButtons( wxCommandEvent &event ) -{ - switch (event.GetId()) - { - case ID_RADIOBOX_ENABLE: - m_radio->Enable( event.GetInt() == 0 ); - break; - - case ID_RADIOBOX_SEL_NUM: - m_radio->SetSelection( 2 ); - break; - - case ID_RADIOBOX_SEL_STR: - m_radio->SetStringSelection( wxT("This") ); - break; - - case ID_RADIOBOX_FONT: - m_radio->SetFont( *wxITALIC_FONT ); - break; - } -} - -void MyPanel::OnSetFont( wxCommandEvent &WXUNUSED(event) ) -{ - m_fontButton->SetFont( *wxITALIC_FONT ); - m_text->SetFont( *wxITALIC_FONT ); -} - -void MyPanel::OnUpdateLabel( wxCommandEvent &event ) -{ - m_label->SetLabel(event.GetInt() ? wxT("Very very very very very long text.") - : wxT("Shorter text.")); -} - -#if wxUSE_SLIDER - -void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) ) -{ -#if wxUSE_GAUGE - m_gauge->SetValue( m_slider->GetValue() ); - m_gaugeVert->SetValue( m_slider->GetValue() / 2 ); -#endif // wxUSE_GAUGE -} - -#endif // wxUSE_SLIDER - -#if wxUSE_SPINCTRL - -void MyPanel::OnSpinCtrlText(wxCommandEvent& event) -{ - if ( m_spinctrl ) - { - wxString s; - s.Printf( wxT("Spin ctrl text changed: now %d (from event: %s)\n"), - m_spinctrl->GetValue(), event.GetString().c_str() ); - m_text->AppendText(s); - } -} - -void MyPanel::OnSpinCtrl(wxSpinEvent& event) -{ - if ( m_spinctrl ) - { - wxString s; - s.Printf( wxT("Spin ctrl changed: now %d (from event: %d)\n"), - m_spinctrl->GetValue(), event.GetInt() ); - m_text->AppendText(s); - } -} - -void MyPanel::OnSpinCtrlUp(wxSpinEvent& event) -{ - if ( m_spinctrl ) - { - m_text->AppendText( wxString::Format( - wxT("Spin up: %d (from event: %d)\n"), - m_spinctrl->GetValue(), event.GetInt() ) ); - } -} - -void MyPanel::OnSpinCtrlDown(wxSpinEvent& event) -{ - if ( m_spinctrl ) - { - m_text->AppendText( wxString::Format( - wxT("Spin down: %d (from event: %d)\n"), - m_spinctrl->GetValue(), event.GetInt() ) ); - } -} - -#endif // wxUSE_SPINCTRL - -#if wxUSE_SPINBTN -void MyPanel::OnSpinUp( wxSpinEvent &event ) -{ - wxString value; - value.Printf( wxT("Spin control up: current = %d\n"), - m_spinbutton->GetValue()); - - if ( event.GetPosition() > 17 ) - { - value += wxT("Preventing the spin button from going above 17.\n"); - - event.Veto(); - } - - m_text->AppendText(value); -} - -void MyPanel::OnSpinDown( wxSpinEvent &event ) -{ - wxString value; - value.Printf( wxT("Spin control down: current = %d\n"), - m_spinbutton->GetValue()); - - if ( event.GetPosition() < -17 ) - { - value += wxT("Preventing the spin button from going below -17.\n"); - - event.Veto(); - } - - m_text->AppendText(value); -} - -void MyPanel::OnSpinUpdate( wxSpinEvent &event ) -{ - wxString value; - value.Printf( wxT("%d"), event.GetPosition() ); - // update the value of the text control without sending an event - m_spintext->ChangeValue( value ); - - value.Printf( wxT("Spin control range: (%d, %d), current = %d\n"), - m_spinbutton->GetMin(), m_spinbutton->GetMax(), - m_spinbutton->GetValue()); - - m_text->AppendText(value); -} - -void MyPanel::OnSpinTextChanged(wxCommandEvent& event) -{ - if (m_spintext) - { - wxLogMessage(wxT("EVT_TEXT for the spin text: \"%s\" (event) or \"%s\" (control)."), - event.GetString().c_str(), - m_spintext->GetValue().c_str()); - } -} - -void MyPanel::OnSpinTextEnter(wxCommandEvent& WXUNUSED(event)) -{ - if (m_spintext) - { - wxLogMessage(wxT("Enter pressed in the spin text: value is '%s'."), - m_spintext->GetValue().c_str()); - } -} - -void MyPanel::OnNewText( wxCommandEvent& /* event */) -{ - m_nonWrappingText->SetLabel( wxT("This text is short\nbut still spans\nover three lines.") ); - m_wrappingText->SetLabel( wxT("This text is short but will still be wrapped if it is too long.") ); - m_wrappingText->GetParent()->Layout(); -} - -#if wxUSE_PROGRESSDLG - -void MyPanel::OnUpdateShowProgress( wxUpdateUIEvent& event ) -{ - event.Enable( m_spinbutton->GetValue() > 0 ); -} - -void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) ) -{ - int max = m_spinbutton->GetValue(); - - if ( max <= 0 ) - { - wxLogError(wxT("You must set positive range!")); - return; - } - - wxProgressDialog dialog(wxT("Progress dialog example"), - wxT("An informative message"), - max, // range - this, // parent - wxPD_CAN_ABORT | - wxPD_AUTO_HIDE | - wxPD_APP_MODAL | - wxPD_ELAPSED_TIME | - wxPD_ESTIMATED_TIME | - wxPD_REMAINING_TIME); - - - bool cont = true; - for ( int i = 0; i <= max && cont; i++ ) - { - wxSleep(1); - if ( i == max ) - { - cont = dialog.Update(i, wxT("That's all, folks!")); - } - else if ( i == max / 2 ) - { - cont = dialog.Update(i, wxT("Only a half left (very long message)!")); - } - else - { - cont = dialog.Update(i); - } - } - - if ( !cont ) - { - *m_text << wxT("Progress dialog aborted!\n"); - } - else - { - *m_text << wxT("Countdown from ") << max << wxT(" finished.\n"); - } -} - -#endif // wxUSE_PROGRESSDLG -#endif // wxUSE_SPINBTN - -void MyPanel::OnSizerCheck( wxCommandEvent &event) -{ - switch (event.GetId ()) { - case ID_SIZER_CHECK1: - m_buttonSizer->Show (m_sizerBtn1, event.IsChecked ()); - m_buttonSizer->Layout (); - break; - case ID_SIZER_CHECK2: - m_buttonSizer->Show (m_sizerBtn2, event.IsChecked ()); - m_buttonSizer->Layout (); - break; - case ID_SIZER_CHECK3: - m_buttonSizer->Show (m_sizerBtn3, event.IsChecked ()); - m_buttonSizer->Layout (); - break; - case ID_SIZER_CHECK4: - m_buttonSizer->Show (m_sizerBtn4, event.IsChecked ()); - m_buttonSizer->Layout (); - break; - case ID_SIZER_CHECK14: - m_hsizer->Show (m_buttonSizer, event.IsChecked ()); - m_hsizer->Layout (); - break; - case ID_SIZER_CHECKBIG: - m_hsizer->Show (m_bigBtn, event.IsChecked ()); - m_hsizer->Layout (); - break; - } - -} - -MyPanel::~MyPanel() -{ - //wxLog::RemoveTraceMask(wxT("focus")); - delete wxLog::SetActiveTarget(m_logTargetOld); - - delete m_book->GetImageList(); -} - -//---------------------------------------------------------------------- -// MyFrame -//---------------------------------------------------------------------- - -wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) - EVT_MENU(CONTROLS_QUIT, MyFrame::OnQuit) - EVT_MENU(CONTROLS_ABOUT, MyFrame::OnAbout) - EVT_MENU(CONTROLS_CLEAR_LOG, MyFrame::OnClearLog) -#if wxUSE_TOOLTIPS - EVT_MENU(CONTROLS_SET_TOOLTIP_DELAY, MyFrame::OnSetTooltipDelay) - EVT_MENU(CONTROLS_ENABLE_TOOLTIPS, MyFrame::OnToggleTooltips) -#ifdef __WXMSW__ - EVT_MENU(CONTROLS_SET_TOOLTIPS_MAX_WIDTH, MyFrame::OnSetMaxTooltipWidth) -#endif // __WXMSW__ -#endif // wxUSE_TOOLTIPS - - EVT_MENU(CONTROLS_ENABLE_ALL, MyFrame::OnEnableAll) - EVT_MENU(CONTROLS_HIDE_ALL, MyFrame::OnHideAll) - EVT_MENU(CONTROLS_HIDE_LIST, MyFrame::OnHideList) - EVT_MENU(CONTROLS_CONTEXT_HELP, MyFrame::OnContextHelp) - - EVT_ICONIZE(MyFrame::OnIconized) - EVT_MAXIMIZE(MyFrame::OnMaximized) - EVT_SIZE(MyFrame::OnSize) - EVT_MOVE(MyFrame::OnMove) - - EVT_IDLE(MyFrame::OnIdle) -wxEND_EVENT_TABLE() - -MyFrame::MyFrame(const wxChar *title, int x, int y) - : wxFrame(NULL, wxID_ANY, title, wxPoint(x, y), wxSize(700, 450)) -{ - SetHelpText( wxT("Controls sample demonstrating various widgets") ); - - // Give it an icon - // The wxICON() macros loads an icon from a resource under Windows - // and uses an #included XPM image under GTK+ and Motif - - SetIcon( wxICON(sample) ); - - wxMenu *file_menu = new wxMenu; - - file_menu->Append(CONTROLS_CLEAR_LOG, wxT("&Clear log\tCtrl-L")); - file_menu->AppendSeparator(); - file_menu->Append(CONTROLS_ABOUT, wxT("&About\tF1")); - file_menu->AppendSeparator(); - file_menu->Append(CONTROLS_QUIT, wxT("E&xit\tAlt-X"), wxT("Quit controls sample")); - - wxMenuBar *menu_bar = new wxMenuBar; - menu_bar->Append(file_menu, wxT("&File")); - -#if wxUSE_TOOLTIPS - wxMenu *tooltip_menu = new wxMenu; - tooltip_menu->Append(CONTROLS_SET_TOOLTIP_DELAY, wxT("Set &delay\tCtrl-D")); - tooltip_menu->AppendSeparator(); - tooltip_menu->Append(CONTROLS_ENABLE_TOOLTIPS, wxT("&Toggle tooltips\tCtrl-T"), - wxT("enable/disable tooltips"), true); - tooltip_menu->Check(CONTROLS_ENABLE_TOOLTIPS, true); -#ifdef __WXMSW__ - tooltip_menu->Append(CONTROLS_SET_TOOLTIPS_MAX_WIDTH, "Set maximal &width"); -#endif // __WXMSW__ - menu_bar->Append(tooltip_menu, wxT("&Tooltips")); -#endif // wxUSE_TOOLTIPS - - wxMenu *panel_menu = new wxMenu; - panel_menu->Append(CONTROLS_ENABLE_ALL, wxT("&Disable all\tCtrl-E"), - wxT("Enable/disable all panel controls"), true); - panel_menu->Append(CONTROLS_HIDE_ALL, wxT("&Hide all\tCtrl-I"), - wxT("Show/hide thoe whole panel controls"), true); - panel_menu->Append(CONTROLS_HIDE_LIST, wxT("Hide &list ctrl\tCtrl-S"), - wxT("Enable/disable all panel controls"), true); - panel_menu->Append(CONTROLS_CONTEXT_HELP, wxT("&Context help...\tCtrl-H"), - wxT("Get context help for a control")); - menu_bar->Append(panel_menu, wxT("&Panel")); - - SetMenuBar(menu_bar); - -#if wxUSE_STATUSBAR - CreateStatusBar(2); -#endif // wxUSE_STATUSBAR - - m_panel = new MyPanel( this, 10, 10, 300, 100 ); -} - -void MyFrame::OnQuit (wxCommandEvent& WXUNUSED(event) ) -{ - Close(true); -} - -void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) ) -{ - wxBusyCursor bc; - - wxMessageDialog dialog(this, wxT("This is a control sample"), wxT("About Controls"), wxOK ); - dialog.ShowModal(); -} - -void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event)) -{ - m_panel->m_text->Clear(); -} - -#if wxUSE_TOOLTIPS -void MyFrame::OnSetTooltipDelay(wxCommandEvent& WXUNUSED(event)) -{ - static long s_delay = 5000; - - wxString delay; - delay.Printf( wxT("%ld"), s_delay); - - delay = wxGetTextFromUser(wxT("Enter delay (in milliseconds)"), - wxT("Set tooltip delay"), - delay, - this); - if ( !delay ) - return; // cancelled - - wxSscanf(delay, wxT("%ld"), &s_delay); - - wxToolTip::SetDelay(s_delay); - - wxLogStatus(this, wxT("Tooltip delay set to %ld milliseconds"), s_delay); -} - -void MyFrame::OnToggleTooltips(wxCommandEvent& WXUNUSED(event)) -{ - static bool s_enabled = true; - - s_enabled = !s_enabled; - - wxToolTip::Enable(s_enabled); - - wxLogStatus(this, wxT("Tooltips %sabled"), s_enabled ? wxT("en") : wxT("dis") ); -} - -#ifdef __WXMSW__ - -void MyFrame::OnSetMaxTooltipWidth(wxCommandEvent& WXUNUSED(event)) -{ - static int s_maxWidth = 0; - - wxNumberEntryDialog dlg - ( - this, - "Change maximal tooltip width", - "&Width in pixels:", - GetTitle(), - s_maxWidth, - -1, - 600 - ); - if ( dlg.ShowModal() == wxID_CANCEL ) - return; - - s_maxWidth = dlg.GetValue(); - wxToolTip::SetMaxWidth(s_maxWidth); - - // we need to set the tooltip again to test the new width - m_panel->SetAllToolTips(); -} - -#endif // __WXMSW__ - -#endif // wxUSE_TOOLTIPS - -void MyFrame::OnEnableAll(wxCommandEvent& WXUNUSED(event)) -{ - static bool s_enable = true; - - s_enable = !s_enable; - m_panel->Enable(s_enable); - static bool s_enableCheckbox = true; - if ( !s_enable ) - { - // this is a test for correct behaviour of either enabling or disabling - // a child when its parent is disabled: the checkbox should have the - // correct state when the parent is enabled back - m_panel->m_checkbox->Enable(s_enableCheckbox); - s_enableCheckbox = !s_enableCheckbox; - } -} - -void MyFrame::OnHideAll(wxCommandEvent& WXUNUSED(event)) -{ - static bool s_show = true; - - s_show = !s_show; - m_panel->Show(s_show); -} - -void MyFrame::OnHideList(wxCommandEvent& WXUNUSED(event)) -{ - static bool s_show = true; - - s_show = !s_show; - m_panel->m_listbox->Show(s_show); -} - -void MyFrame::OnContextHelp(wxCommandEvent& WXUNUSED(event)) -{ - // starts a local event loop - wxContextHelp chelp(this); -} - -void MyFrame::OnMove( wxMoveEvent& event ) -{ -#if wxUSE_STATUSBAR - UpdateStatusBar(event.GetPosition(), GetSize()); -#endif // wxUSE_STATUSBAR - - event.Skip(); -} - -void MyFrame::OnIconized( wxIconizeEvent& event ) -{ - wxLogMessage(wxT("Frame %s"), event.IsIconized() ? wxT("iconized") - : wxT("restored")); - event.Skip(); -} - -void MyFrame::OnMaximized( wxMaximizeEvent& WXUNUSED(event) ) -{ - wxLogMessage(wxT("Frame maximized")); -} - -void MyFrame::OnSize( wxSizeEvent& event ) -{ -#if wxUSE_STATUSBAR - UpdateStatusBar(GetPosition(), event.GetSize()); -#endif // wxUSE_STATUSBAR - - event.Skip(); -} - -void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) ) -{ - // track the window which has the focus in the status bar - static wxWindow *s_windowFocus = NULL; - wxWindow *focus = wxWindow::FindFocus(); - if ( focus != s_windowFocus ) - { - s_windowFocus = focus; - - wxString msg; - if ( focus ) - { - msg.Printf( - "Focus: %s" -#ifdef __WXMSW__ - ", HWND = %08x" -#endif - , s_windowFocus->GetName().c_str() -#ifdef __WXMSW__ - , (unsigned)wxPtrToUInt(s_windowFocus->GetHWND()) -#endif - ); - } - else - { - msg = wxT("No focus"); - } - -#if wxUSE_STATUSBAR - SetStatusText(msg); -#endif // wxUSE_STATUSBAR - } -} - -void MyComboBox::OnChar(wxKeyEvent& event) -{ - wxLogMessage(wxT("MyComboBox::OnChar")); - - if ( event.GetKeyCode() == 'w' ) - { - wxLogMessage(wxT("MyComboBox: 'w' will be ignored.")); - } - else - { - event.Skip(); - } -} - -void MyComboBox::OnKeyDown(wxKeyEvent& event) -{ - wxLogMessage(wxT("MyComboBox::OnKeyDown")); - - if ( event.GetKeyCode() == 'w' ) - { - wxLogMessage(wxT("MyComboBox: 'w' will be ignored.")); - } - else - { - event.Skip(); - } -} - -void MyComboBox::OnKeyUp(wxKeyEvent& event) -{ - wxLogMessage(wxT("MyComboBox::OnKeyUp")); - - event.Skip(); -} - -static void SetListboxClientData(const wxChar *name, wxCheckListBox *control) -{ - size_t count = control->GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - wxString s; - s.Printf(wxT("%s client data for '%s'"), - name, control->GetString(n).c_str()); - - control->SetClientObject(n, new wxStringClientData(s)); - } -} - -#if wxUSE_CHOICE - -static void SetChoiceClientData(const wxChar *name, wxChoice *control) -{ - size_t count = control->GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - wxString s; - s.Printf(wxT("%s client data for '%s'"), - name, control->GetString(n).c_str()); - - control->SetClientObject(n, new wxStringClientData(s)); - } -} - -#endif // wxUSE_CHOICE diff --git a/samples/controls/controls.rc b/samples/controls/controls.rc deleted file mode 100644 index 51ff722dfe..0000000000 --- a/samples/controls/controls.rc +++ /dev/null @@ -1,8 +0,0 @@ -#include "../sample.rc" - -choice BITMAP "icons/choice.bmp" -combo BITMAP "icons/combo.bmp" -gauge BITMAP "icons/gauge.bmp" -list BITMAP "icons/list.bmp" -radio BITMAP "icons/radio.bmp" -text BITMAP "icons/text.bmp" diff --git a/samples/controls/controls_vc7.vcproj b/samples/controls/controls_vc7.vcproj deleted file mode 100644 index 086ff8a6ed..0000000000 --- a/samples/controls/controls_vc7.vcproj +++ /dev/null @@ -1,303 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/controls/controls_vc8.vcproj b/samples/controls/controls_vc8.vcproj deleted file mode 100644 index 25852b6b6b..0000000000 --- a/samples/controls/controls_vc8.vcproj +++ /dev/null @@ -1,829 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/controls/controls_vc9.vcproj b/samples/controls/controls_vc9.vcproj deleted file mode 100644 index 667df56780..0000000000 --- a/samples/controls/controls_vc9.vcproj +++ /dev/null @@ -1,801 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/controls/descrip.mms b/samples/controls/descrip.mms deleted file mode 100644 index a636afcc24..0000000000 --- a/samples/controls/descrip.mms +++ /dev/null @@ -1,47 +0,0 @@ -#***************************************************************************** -# * -# Make file for VMS * -# Author : J.Jansen (joukj@hrem.stm.tudelft.nl) * -# Date : 10 November 1999 * -# * -#***************************************************************************** -.first - define wx [--.include.wx] - -.ifdef __WXMOTIF__ -CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\ - /assume=(nostdnew,noglobal_array_new) -.else -.ifdef __WXGTK__ -CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\ - /assume=(nostdnew,noglobal_array_new) -.else -CXX_DEFINE = -.endif -.endif - -.suffixes : .cpp - -.cpp.obj : - cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp - -all : -.ifdef __WXMOTIF__ - $(MMS)$(MMSQUALIFIERS) controls.exe -.else -.ifdef __WXGTK__ - $(MMS)$(MMSQUALIFIERS) controls_gtk.exe -.endif -.endif - -.ifdef __WXMOTIF__ -controls.exe : controls.obj - cxxlink controls,[--.lib]vms/opt -.else -.ifdef __WXGTK__ -controls_gtk.exe : controls.obj - cxxlink/exec=controls_gtk.exe controls,[--.lib]vms_gtk/opt -.endif -.endif - -controls.obj : controls.cpp diff --git a/samples/controls/icons/choice.bmp b/samples/controls/icons/choice.bmp deleted file mode 100644 index ac6edb6bba..0000000000 Binary files a/samples/controls/icons/choice.bmp and /dev/null differ diff --git a/samples/controls/icons/choice.xpm b/samples/controls/icons/choice.xpm deleted file mode 100644 index 66758b1dcd..0000000000 --- a/samples/controls/icons/choice.xpm +++ /dev/null @@ -1,27 +0,0 @@ -/* XPM */ -static const char *const choice_xpm[] = { -/* width height ncolors chars_per_pixel */ -"16 16 5 1", -/* colors */ -" s None c None", -". c #000000", -"+ c #c0c0c0", -"@ c #808080", -"# c #ffffff", -/* pixels */ -"@@@@@@@@@@@@@@@@", -"@..............@", -"@.########+++++@", -"@.########.....@", -"@.########+...+@", -"@.########++.++@", -"@.+++++++++++++@", -"@@@@@@@@@@@@@@@@", -" ##############", -" ..............", -" .#########+.+.", -" .#########....", -" .#########+++.", -" .#########....", -" .#########+.+.", -" .............."}; diff --git a/samples/controls/icons/combo.bmp b/samples/controls/icons/combo.bmp deleted file mode 100644 index 9690a167b0..0000000000 Binary files a/samples/controls/icons/combo.bmp and /dev/null differ diff --git a/samples/controls/icons/combo.xpm b/samples/controls/icons/combo.xpm deleted file mode 100644 index 89ee6a2d25..0000000000 --- a/samples/controls/icons/combo.xpm +++ /dev/null @@ -1,27 +0,0 @@ -/* XPM */ -static const char *const combo_xpm[] = { -/* width height ncolors chars_per_pixel */ -"16 16 5 1", -/* colors */ -" s None c None", -". c #000000", -"+ c #c0c0c0", -"@ c #808080", -"# c #ffffff", -/* pixels */ -"@@@@@@@@@@@@@@@@", -"@..............@", -"@....#####+++++@", -"@.#.######.....@", -"@.#.######+...+@", -"@....#####++.++@", -"@.+++++++++++++@", -"@@@@@@@@@@@@@@@@", -" ##############", -" ..............", -" .#########+.+.", -" .#########....", -" .#########+++.", -" .#########....", -" .#########+.+.", -" .............."}; diff --git a/samples/controls/icons/gauge.bmp b/samples/controls/icons/gauge.bmp deleted file mode 100644 index 14dd39123e..0000000000 Binary files a/samples/controls/icons/gauge.bmp and /dev/null differ diff --git a/samples/controls/icons/gauge.xpm b/samples/controls/icons/gauge.xpm deleted file mode 100644 index 3d5ad255c9..0000000000 --- a/samples/controls/icons/gauge.xpm +++ /dev/null @@ -1,27 +0,0 @@ -/* XPM */ -static const char *const gauge_xpm[] = { -/* width height ncolors chars_per_pixel */ -"16 16 5 1", -/* colors */ -" s None c None", -". c #000000", -"+ c #000080", -"@ c #c0c0c0", -"# c #808080", -/* pixels */ -" ", -" ", -" ", -"################", -"#..............#", -"#.++++++++@@@@@#", -"#.++++++++@@@@@#", -"#.++++++++@@@@@#", -"#.++++++++@@@@@#", -"#.++++++++@@@@@#", -"#.++++++++@@@@@#", -"#.++++++++@@@@@#", -"################", -" ", -" ", -" "}; diff --git a/samples/controls/icons/list.bmp b/samples/controls/icons/list.bmp deleted file mode 100644 index 384955d8ab..0000000000 Binary files a/samples/controls/icons/list.bmp and /dev/null differ diff --git a/samples/controls/icons/list.xpm b/samples/controls/icons/list.xpm deleted file mode 100644 index e50e5e9540..0000000000 --- a/samples/controls/icons/list.xpm +++ /dev/null @@ -1,27 +0,0 @@ -/* XPM */ -static const char *const list_xpm[] = { -/* width height ncolors chars_per_pixel */ -"16 16 5 1", -/* colors */ -" s None c None", -". c #000000", -"+ c #c0c0c0", -"@ c #808080", -"# c #ffffff", -/* pixels */ -"@@@@@@@@@@@@@@@@", -"@..............@", -"@.##########+++@", -"@.##########+.+@", -"@.++++++++++...@", -"@.##########+++@", -"@.##########+++@", -"@.+++++++++++++@", -"@.##########+++@", -"@.##########+++@", -"@.+++++++++++++@", -"@.##########+++@", -"@.##########...@", -"@.##########+.+@", -"@.+++++++++++++@", -"@@@@@@@@@@@@@@@@"}; diff --git a/samples/controls/icons/radio.bmp b/samples/controls/icons/radio.bmp deleted file mode 100644 index 51b183f68b..0000000000 Binary files a/samples/controls/icons/radio.bmp and /dev/null differ diff --git a/samples/controls/icons/radio.xpm b/samples/controls/icons/radio.xpm deleted file mode 100644 index 257b267321..0000000000 --- a/samples/controls/icons/radio.xpm +++ /dev/null @@ -1,27 +0,0 @@ -/* XPM */ -static const char *const radio_xpm[] = { -/* width height ncolors chars_per_pixel */ -"16 16 5 1", -/* colors */ -" s None c None", -". c #000000", -"+ c #c0c0c0", -"@ c #808080", -"# c #ffffff", -/* pixels */ -" . ", -" .. .. ", -"+++.+.++...++++.", -"+@.@...@@..@@@@.", -"+@.+++.+....++@.", -"+@++++++++++++@.", -"+@++++++++++++@.", -"+@++++...+++++@.", -"+@+++.###@++++@.", -"+@+++.#.#@++++@.", -"+@+++.###@++++@.", -"+@++++@@@+++++@.", -"+@++++++++++++@.", -"+@++++++++++++@.", -"+@@@@@@@@@@@@@@.", -"................"}; diff --git a/samples/controls/icons/stattext.xpm b/samples/controls/icons/stattext.xpm deleted file mode 100644 index 07fbf80922..0000000000 --- a/samples/controls/icons/stattext.xpm +++ /dev/null @@ -1,24 +0,0 @@ -/* XPM */ -static const char *const stattext_xpm[] = { -/* width height ncolors chars_per_pixel */ -"16 16 2 1", -/* colors */ -" s None c None", -". c #000000", -/* pixels */ -" ", -" ", -" ", -" .. ", -" .. ", -" .... ", -" .... .... ", -" . . .. .. ", -" .. .. .... ", -" .. .. .. .. ", -" ...... .. .. ", -".. .. .. .. ", -".. .. ..... ", -" ", -" ", -" "}; diff --git a/samples/controls/icons/text.bmp b/samples/controls/icons/text.bmp deleted file mode 100644 index 2ae397d694..0000000000 Binary files a/samples/controls/icons/text.bmp and /dev/null differ diff --git a/samples/controls/icons/text.xpm b/samples/controls/icons/text.xpm deleted file mode 100644 index 0f6c08389c..0000000000 --- a/samples/controls/icons/text.xpm +++ /dev/null @@ -1,27 +0,0 @@ -/* XPM */ -static const char *const text_xpm[] = { -/* width height ncolors chars_per_pixel */ -"16 16 5 1", -/* colors */ -" s None c None", -". c #000000", -"+ c #c0c0c0", -"@ c #808080", -"# c #ffffff", -/* pixels */ -" ", -" ", -" ", -"@@@@@@@@@@@@@@@@", -"@..............@", -"@.############+@", -"@.#...########+@", -"@.##.#########+@", -"@.##.#########+@", -"@.#...########+@", -"@.############+@", -"@.+++++++++++++@", -"@@@@@@@@@@@@@@@@", -" ", -" ", -" "}; diff --git a/samples/controls/makefile.bcc b/samples/controls/makefile.bcc deleted file mode 100644 index 24963d13f0..0000000000 --- a/samples/controls/makefile.bcc +++ /dev/null @@ -1,243 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -.autodepend - -!ifndef BCCDIR -!ifndef MAKEDIR -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif -BCCDIR = $(MAKEDIR)\.. -!endif - -!include ../../build/msw/config.bcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 31 -COMPILER_PREFIX = bcc -OBJS = \ - $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -CONTROLS_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. \ - $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS) -CONTROLS_OBJECTS = \ - $(OBJS)\controls_controls.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw$(TOOLKIT_VERSION) -!endif -!if "$(OFFICIAL_BUILD)" == "1" -COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD -!endif -!if "$(BUILD)" == "debug" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_2 = -Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_2 = -O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_5 = -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_5 = mt -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_6 = -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_6 = -tWM -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_7 = -tWR -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_7 = -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = i -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0 -!endif -!if "$(BUILD)" == "release" -__NDEBUG_DEFINE_p = -DNDEBUG -!endif -!if "$(BUILD)" == "release" -__NDEBUG_DEFINE_p_1 = -dNDEBUG -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = -DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = -dwxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = -DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = -dwxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = -D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = -d_UNICODE -!endif -!if "$(USE_CAIRO)" == "1" -____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo -!endif -!if "$(USE_CAIRO)" == "1" -____CAIRO_INCLUDEDIR_FILENAMES_1_p = -i$(CAIRO_ROOT)\include\cairo -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = -DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = -dWXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" -__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(USE_CAIRO)" == "1" -__CAIRO_LIB_p = cairo.lib -!endif -!if "$(USE_CAIRO)" == "1" -____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = -v -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = -v- -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO = -v- -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO = -v -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\controls.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.csm del $(OBJS)\*.csm - -if exist $(OBJS)\controls.exe del $(OBJS)\controls.exe - -if exist $(OBJS)\controls.tds del $(OBJS)\controls.tds - -if exist $(OBJS)\controls.ilc del $(OBJS)\controls.ilc - -if exist $(OBJS)\controls.ild del $(OBJS)\controls.ild - -if exist $(OBJS)\controls.ilf del $(OBJS)\controls.ilf - -if exist $(OBJS)\controls.ils del $(OBJS)\controls.ils - -$(OBJS)\controls.exe: $(CONTROLS_OBJECTS) $(OBJS)\controls_controls.res - ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| - c0w32.obj $(CONTROLS_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\controls_controls.res -| - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (test2.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\controls_controls.obj: .\controls.cpp - $(CXX) -q -c -P -o$@ $(CONTROLS_CXXFLAGS) .\controls.cpp - -$(OBJS)\controls_controls.res: .\controls.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -i$(BCCDIR)\include\windows\sdk -dNOPCH .\controls.rc - diff --git a/samples/controls/makefile.gcc b/samples/controls/makefile.gcc deleted file mode 100644 index f9fb7cb3d5..0000000000 --- a/samples/controls/makefile.gcc +++ /dev/null @@ -1,239 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -include ../../build/msw/config.gcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -CPPDEPS = -MT$@ -MF$@.d -MD -MP -WX_RELEASE_NODOT = 31 -COMPILER_PREFIX = gcc -OBJS = \ - $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -CONTROLS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W \ - -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \ - $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -CONTROLS_OBJECTS = \ - $(OBJS)\controls_controls.o \ - $(OBJS)\controls_controls_rc.o - -### Conditionally set variables: ### - -ifeq ($(GCC_VERSION),2.95) -GCCFLAGS = -fvtable-thunks -endif -ifeq ($(USE_GUI),0) -PORTNAME = base -endif -ifeq ($(USE_GUI),1) -PORTNAME = msw$(TOOLKIT_VERSION) -endif -ifeq ($(OFFICIAL_BUILD),1) -COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD -endif -ifeq ($(BUILD),debug) -WXDEBUGFLAG = d -endif -ifeq ($(UNICODE),1) -WXUNICODEFLAG = u -endif -ifeq ($(WXUNIV),1) -WXUNIVNAME = univ -endif -ifeq ($(SHARED),1) -WXDLLFLAG = dll -endif -ifeq ($(SHARED),0) -LIBTYPE_SUFFIX = lib -endif -ifeq ($(SHARED),1) -LIBTYPE_SUFFIX = dll -endif -ifeq ($(MONOLITHIC),0) -EXTRALIBS_FOR_BASE = -endif -ifeq ($(MONOLITHIC),1) -EXTRALIBS_FOR_BASE = -endif -ifeq ($(BUILD),debug) -__OPTIMIZEFLAG_2 = -O0 -endif -ifeq ($(BUILD),release) -__OPTIMIZEFLAG_2 = -O2 -endif -ifeq ($(USE_RTTI),0) -__RTTIFLAG_5 = -fno-rtti -endif -ifeq ($(USE_RTTI),1) -__RTTIFLAG_5 = -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONSFLAG_6 = -fno-exceptions -endif -ifeq ($(USE_EXCEPTIONS),1) -__EXCEPTIONSFLAG_6 = -endif -ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -endif -ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ -endif -ifeq ($(DEBUG_FLAG),0) -__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -endif -ifeq ($(DEBUG_FLAG),0) -__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 -endif -ifeq ($(BUILD),release) -__NDEBUG_DEFINE_p = -DNDEBUG -endif -ifeq ($(BUILD),release) -__NDEBUG_DEFINE_p_1 = --define NDEBUG -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS -endif -ifeq ($(USE_RTTI),0) -__RTTI_DEFINE_p = -DwxNO_RTTI -endif -ifeq ($(USE_RTTI),0) -__RTTI_DEFINE_p_1 = --define wxNO_RTTI -endif -ifeq ($(USE_THREADS),0) -__THREAD_DEFINE_p = -DwxNO_THREADS -endif -ifeq ($(USE_THREADS),0) -__THREAD_DEFINE_p_1 = --define wxNO_THREADS -endif -ifeq ($(UNICODE),0) -__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 -endif -ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p = -D_UNICODE -endif -ifeq ($(UNICODE),0) -__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0 -endif -ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p_1 = --define _UNICODE -endif -ifeq ($(USE_CAIRO),1) -____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo -endif -ifeq ($(USE_CAIRO),1) -__CAIRO_INCLUDEDIR_p = --include-dir $(CAIRO_ROOT)/include/cairo -endif -ifeq ($(SHARED),1) -__DLLFLAG_p = -DWXUSINGDLL -endif -ifeq ($(SHARED),1) -__DLLFLAG_p_1 = --define WXUSINGDLL -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_CORE_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_BASE_p = \ - -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -endif -ifeq ($(MONOLITHIC),1) -__WXLIB_MONO_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -endif -ifeq ($(MONOLITHIC),1) -ifeq ($(USE_STC),1) -__LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) -endif -endif -ifeq ($(USE_GUI),1) -__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -endif -ifeq ($(USE_GUI),1) -__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -endif -ifeq ($(USE_GUI),1) -__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -endif -ifeq ($(USE_CAIRO),1) -__CAIRO_LIB_p = -lcairo -endif -ifeq ($(USE_CAIRO),1) -____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib -endif -ifeq ($(BUILD),debug) -ifeq ($(DEBUG_INFO),default) -__DEBUGINFO = -g -endif -endif -ifeq ($(BUILD),release) -ifeq ($(DEBUG_INFO),default) -__DEBUGINFO = -endif -endif -ifeq ($(DEBUG_INFO),0) -__DEBUGINFO = -endif -ifeq ($(DEBUG_INFO),1) -__DEBUGINFO = -g -endif -ifeq ($(USE_THREADS),0) -__THREADSFLAG = -endif -ifeq ($(USE_THREADS),1) -__THREADSFLAG = -mthreads -endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\controls.exe data - -clean: - -if exist $(OBJS)\*.o del $(OBJS)\*.o - -if exist $(OBJS)\*.d del $(OBJS)\*.d - -if exist $(OBJS)\controls.exe del $(OBJS)\controls.exe - -$(OBJS)\controls.exe: $(CONTROLS_OBJECTS) $(OBJS)\controls_controls_rc.o - $(CXX) -o $@ $(CONTROLS_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %%f in (test2.bmp) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) - -$(OBJS)\controls_controls.o: ./controls.cpp - $(CXX) -c -o $@ $(CONTROLS_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\controls_controls_rc.o: ./controls.rc - $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH - -.PHONY: all clean data - - -SHELL := $(COMSPEC) - -# Dependencies tracking: --include $(OBJS)/*.d diff --git a/samples/controls/makefile.unx b/samples/controls/makefile.unx deleted file mode 100644 index ae396b9b32..0000000000 --- a/samples/controls/makefile.unx +++ /dev/null @@ -1,100 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - - - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# C++ compiler -CXX = `$(WX_CONFIG) --cxx` - -# Standard flags for C++ -CXXFLAGS ?= - -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS ?= - -# Standard linker flags -LDFLAGS ?= - -# Location and arguments of wx-config script -WX_CONFIG ?= wx-config - -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb] -WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) - -# Use DLL build of wx library to use? [0,1] -WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --query-linkage`; then echo 1; else echo 0; fi) - -# Compile Unicode build of wxWidgets? [0,1] -WX_UNICODE ?= $(shell $(WX_CONFIG) --query-chartype | sed 's/unicode/1/;s/ansi/0/') - -# Version of the wx library to build against. -WX_VERSION ?= $(shell $(WX_CONFIG) --query-version | sed -e 's/\([0-9]*\)\.\([0-9]*\)/\1\2/') - - - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP -WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) -WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) -WX_CONFIG_FLAGS = $(WX_CONFIG_UNICODE_FLAG) $(WX_CONFIG_SHARED_FLAG) \ - --toolkit=$(WX_PORT) --version=$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -CONTROLS_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \ - $(CXXFLAGS) -CONTROLS_OBJECTS = \ - controls_controls.o - -### Conditionally set variables: ### - -ifeq ($(WX_UNICODE),0) -WX_CONFIG_UNICODE_FLAG = --unicode=no -endif -ifeq ($(WX_UNICODE),1) -WX_CONFIG_UNICODE_FLAG = --unicode=yes -endif -ifeq ($(WX_SHARED),0) -WX_CONFIG_SHARED_FLAG = --static=yes -endif -ifeq ($(WX_SHARED),1) -WX_CONFIG_SHARED_FLAG = --static=no -endif - - -### Targets: ### - -all: test_for_selected_wxbuild controls - -install: - -uninstall: - -clean: - rm -f ./*.o - rm -f ./*.d - rm -f controls - -test_for_selected_wxbuild: - @$(WX_CONFIG) $(WX_CONFIG_FLAGS) - -controls: $(CONTROLS_OBJECTS) - $(CXX) -o $@ $(CONTROLS_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` - -controls_controls.o: ./controls.cpp - $(CXX) -c -o $@ $(CONTROLS_CXXFLAGS) $(CPPDEPS) $< - -.PHONY: all install uninstall clean - - -# Dependencies tracking: --include ./*.d diff --git a/samples/controls/makefile.vc b/samples/controls/makefile.vc deleted file mode 100644 index fcd26415fa..0000000000 --- a/samples/controls/makefile.vc +++ /dev/null @@ -1,366 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include <../../build/msw/config.vc> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 31 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -CONTROLS_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\controls.pdb $(____DEBUGRUNTIME_3_p) \ - $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ - /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ - $(CPPFLAGS) $(CXXFLAGS) -CONTROLS_OBJECTS = \ - $(OBJS)\controls_controls.obj -CONTROLS_RESOURCES = \ - $(OBJS)\controls_controls.res - -### Conditionally set variables: ### - -!if "$(TARGET_CPU)" == "AMD64" -ARCH_SUFFIX = _x64 -!endif -!if "$(TARGET_CPU)" == "IA64" -ARCH_SUFFIX = _ia64 -!endif -!if "$(TARGET_CPU)" == "X64" -ARCH_SUFFIX = _x64 -!endif -!if "$(TARGET_CPU)" == "amd64" -ARCH_SUFFIX = _x64 -!endif -!if "$(TARGET_CPU)" == "ia64" -ARCH_SUFFIX = _ia64 -!endif -!if "$(TARGET_CPU)" == "x64" -ARCH_SUFFIX = _x64 -!endif -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw$(TOOLKIT_VERSION) -!endif -!if "$(OFFICIAL_BUILD)" == "1" -COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:X64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "X64" -LINK_TARGET_CPU = /MACHINE:X64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:X64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "x64" -LINK_TARGET_CPU = /MACHINE:X64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_2 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_2 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_3_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_3_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_3_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_3_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_3_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_3_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_3_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_3_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_4 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_4 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_4 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_4 = d -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_5 = -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_5 = /opt:ref /opt:icf -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_5 = /opt:ref /opt:icf -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_5 = -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_6 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_6 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_9 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_9 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_10 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_11 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_11 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_12 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_12 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__NDEBUG_DEFINE_p = /DNDEBUG -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__NDEBUG_DEFINE_p = /DNDEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__NDEBUG_DEFINE_p_1 = /d NDEBUG -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__NDEBUG_DEFINE_p_1 = /d NDEBUG -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(USE_CAIRO)" == "1" -____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo -!endif -!if "$(USE_CAIRO)" == "1" -____CAIRO_INCLUDEDIR_FILENAMES_1_p = /i $(CAIRO_ROOT)\include\cairo -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" -__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(USE_CAIRO)" == "1" -__CAIRO_LIB_p = cairo.lib -!endif -!if "$(USE_CAIRO)" == "1" -____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\controls.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\controls.exe del $(OBJS)\controls.exe - -if exist $(OBJS)\controls.ilk del $(OBJS)\controls.ilk - -if exist $(OBJS)\controls.pdb del $(OBJS)\controls.pdb - -$(OBJS)\controls.exe: $(CONTROLS_OBJECTS) $(OBJS)\controls_controls.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\controls.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< - $(CONTROLS_OBJECTS) $(CONTROLS_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (test2.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\controls_controls.obj: .\controls.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CONTROLS_CXXFLAGS) .\controls.cpp - -$(OBJS)\controls_controls.res: .\controls.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\controls.rc - diff --git a/samples/controls/test2.bmp b/samples/controls/test2.bmp deleted file mode 100644 index 3a65473212..0000000000 Binary files a/samples/controls/test2.bmp and /dev/null differ diff --git a/samples/makefile.bcc b/samples/makefile.bcc index d1179a784f..d1aba076c3 100644 --- a/samples/makefile.bcc +++ b/samples/makefile.bcc @@ -45,7 +45,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ ### Targets: ### -all: access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dll dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power preferences printing propgrid regtest render ribbon richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll webview widgets wizard wrapsizer xrc +all: access animate artprov aui calendar caret clipboard collpane combo config console dataview dialogs dialup display dll dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power preferences printing propgrid regtest render ribbon richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll webview widgets wizard wrapsizer xrc clean: -if exist .\*.obj del .\*.obj @@ -95,10 +95,6 @@ clean: @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>console.bat call console.bat @del console.bat - @echo cd controls >controls.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>controls.bat - call controls.bat - @del controls.bat @echo cd dataview >dataview.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>dataview.bat call dataview.bat @@ -442,12 +438,6 @@ console: call console.bat @del console.bat -controls: - @echo cd controls >controls.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>controls.bat - call controls.bat - @del controls.bat - dataview: @echo cd dataview >dataview.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>dataview.bat diff --git a/samples/makefile.gcc b/samples/makefile.gcc index 154a5454bb..546b47a42d 100644 --- a/samples/makefile.gcc +++ b/samples/makefile.gcc @@ -38,7 +38,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ ### Targets: ### -all: access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dll dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power preferences printing propgrid regtest render ribbon richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll webview widgets wizard wrapsizer xrc +all: access animate artprov aui calendar caret clipboard collpane combo config console dataview dialogs dialup display dll dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power preferences printing propgrid regtest render ribbon richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll webview widgets wizard wrapsizer xrc clean: -if exist .\*.o del .\*.o @@ -54,7 +54,6 @@ clean: $(MAKE) -C combo -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C config -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C console -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C controls -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C dataview -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C dialogs -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C dialup -f makefile.gcc $(MAKEARGS) clean @@ -158,9 +157,6 @@ config: console: $(MAKE) -C console -f makefile.gcc $(MAKEARGS) all -controls: - $(MAKE) -C controls -f makefile.gcc $(MAKEARGS) all - dataview: $(MAKE) -C dataview -f makefile.gcc $(MAKEARGS) all @@ -369,8 +365,8 @@ memcheck: $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) all .PHONY: all clean access animate artprov aui calendar caret clipboard collpane combo \ - config console controls dataview dialogs dialup display dll dnd docview dragimag \ - drawing erase event except exec font grid help htlbox html image internat ipc joytest \ + config console dataview dialogs dialup display dll dnd docview dragimag drawing \ + erase event except exec font grid help htlbox html image internat ipc joytest \ keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto \ opengl ownerdrw popup power preferences printing propgrid regtest render ribbon \ richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg \ diff --git a/samples/makefile.vc b/samples/makefile.vc index 63c5b70d84..4bcdec0444 100644 --- a/samples/makefile.vc +++ b/samples/makefile.vc @@ -36,7 +36,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ ### Targets: ### -all: sub_access sub_animate sub_artprov sub_aui sub_calendar sub_caret sub_clipboard sub_collpane sub_combo sub_config sub_console sub_controls sub_dataview sub_dialogs sub_dialup sub_display sub_dll sub_dnd sub_docview sub_dragimag sub_drawing sub_erase sub_event sub_except sub_exec sub_font sub_grid sub_help sub_htlbox sub_html sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listctrl sub_mdi sub_mediaplayer sub_menu sub_minimal sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_power sub_preferences sub_printing sub_propgrid sub_regtest sub_render sub_ribbon sub_richtext sub_sashtest sub_scroll sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_stc sub_svg sub_taborder sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_uiaction sub_validate sub_vscroll sub_webview sub_widgets sub_wizard sub_wrapsizer sub_xrc +all: sub_access sub_animate sub_artprov sub_aui sub_calendar sub_caret sub_clipboard sub_collpane sub_combo sub_config sub_console sub_dataview sub_dialogs sub_dialup sub_display sub_dll sub_dnd sub_docview sub_dragimag sub_drawing sub_erase sub_event sub_except sub_exec sub_font sub_grid sub_help sub_htlbox sub_html sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listctrl sub_mdi sub_mediaplayer sub_menu sub_minimal sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_power sub_preferences sub_printing sub_propgrid sub_regtest sub_render sub_ribbon sub_richtext sub_sashtest sub_scroll sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_stc sub_svg sub_taborder sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_uiaction sub_validate sub_vscroll sub_webview sub_widgets sub_wizard sub_wrapsizer sub_xrc clean: -if exist .\*.obj del .\*.obj @@ -75,9 +75,6 @@ clean: cd console $(MAKE) -f makefile.vc $(MAKEARGS) clean cd "$(MAKEDIR)" - cd controls - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" cd dataview $(MAKE) -f makefile.vc $(MAKEARGS) clean cd "$(MAKEDIR)" @@ -347,11 +344,6 @@ sub_console: $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" -sub_controls: - cd controls - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - sub_dataview: cd dataview $(MAKE) -f makefile.vc $(MAKEARGS) all diff --git a/samples/samples.bkl b/samples/samples.bkl index cd3fef28a3..82aa39db70 100644 --- a/samples/samples.bkl +++ b/samples/samples.bkl @@ -23,7 +23,6 @@ -