From 806ad819585655ac1c35427409611d7795d0b910 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 21 Apr 2007 18:50:50 +0000 Subject: [PATCH] readded wxEditableListBox as part of adv library git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 22 ++ build/bakefiles/files.bkl | 4 +- build/msw/makefile.bcc | 24 ++ build/msw/makefile.gcc | 24 ++ build/msw/makefile.vc | 24 ++ build/msw/makefile.wat | 24 ++ build/msw/wx_adv.dsp | 8 + build/msw/wx_core.dsp | 4 + include/wx/editlbox.h | 66 +++++ samples/editlbox/Makefile.in | 198 ++++++++++++++ samples/editlbox/editlbox.bkl | 12 + samples/editlbox/editlbox.cpp | 64 +++++ samples/editlbox/editlbox.dsp | 480 ++++++++++++++++++++++++++++++++++ samples/editlbox/editlbox.dsw | 61 +++++ samples/editlbox/makefile.bcc | 238 +++++++++++++++++ samples/editlbox/makefile.gcc | 236 +++++++++++++++++ samples/editlbox/makefile.unx | 110 ++++++++ samples/editlbox/makefile.vc | 313 ++++++++++++++++++++++ samples/editlbox/makefile.wat | 267 +++++++++++++++++++ src/generic/editlbox.cpp | 378 ++++++++++++++++++++++++++ 20 files changed, 2555 insertions(+), 2 deletions(-) create mode 100644 include/wx/editlbox.h create mode 100644 samples/editlbox/Makefile.in create mode 100644 samples/editlbox/editlbox.bkl create mode 100644 samples/editlbox/editlbox.cpp create mode 100644 samples/editlbox/editlbox.dsp create mode 100644 samples/editlbox/editlbox.dsw create mode 100644 samples/editlbox/makefile.bcc create mode 100644 samples/editlbox/makefile.gcc create mode 100644 samples/editlbox/makefile.unx create mode 100644 samples/editlbox/makefile.vc create mode 100644 samples/editlbox/makefile.wat create mode 100644 src/generic/editlbox.cpp diff --git a/Makefile.in b/Makefile.in index aef06ca1f5..c149c00b80 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2882,6 +2882,7 @@ COND_WXUNIV_0_ADVANCED_HDR = \ wx/dataview.h \ wx/dateevt.h \ wx/dcbuffer.h \ + wx/editlbox.h \ wx/generic/aboutdlgg.h \ wx/generic/animate.h \ wx/generic/bmpcbox.h \ @@ -2924,6 +2925,7 @@ COND_WXUNIV_1_ADVANCED_HDR = \ wx/dataview.h \ wx/dateevt.h \ wx/dcbuffer.h \ + wx/editlbox.h \ wx/generic/aboutdlgg.h \ wx/generic/animate.h \ wx/generic/bmpcbox.h \ @@ -5082,6 +5084,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS = \ monodll_calctrl.o \ monodll_datavgen.o \ monodll_datectlg.o \ + monodll_editlbox.o \ monodll_grid.o \ monodll_gridctrl.o \ monodll_gridsel.o \ @@ -5107,6 +5110,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS = \ monodll_calctrl.o \ monodll_datavgen.o \ monodll_datectlg.o \ + monodll_editlbox.o \ monodll_grid.o \ monodll_gridctrl.o \ monodll_gridsel.o \ @@ -6890,6 +6894,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_1 = \ monolib_calctrl.o \ monolib_datavgen.o \ monolib_datectlg.o \ + monolib_editlbox.o \ monolib_grid.o \ monolib_gridctrl.o \ monolib_gridsel.o \ @@ -6915,6 +6920,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1 = \ monolib_calctrl.o \ monolib_datavgen.o \ monolib_datectlg.o \ + monolib_editlbox.o \ monolib_grid.o \ monolib_gridctrl.o \ monolib_gridsel.o \ @@ -10454,6 +10460,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_2 = \ advdll_calctrl.o \ advdll_datavgen.o \ advdll_datectlg.o \ + advdll_editlbox.o \ advdll_grid.o \ advdll_gridctrl.o \ advdll_gridsel.o \ @@ -10479,6 +10486,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_2 = \ advdll_calctrl.o \ advdll_datavgen.o \ advdll_datectlg.o \ + advdll_editlbox.o \ advdll_grid.o \ advdll_gridctrl.o \ advdll_gridsel.o \ @@ -10521,6 +10529,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_3 = \ advlib_calctrl.o \ advlib_datavgen.o \ advlib_datectlg.o \ + advlib_editlbox.o \ advlib_grid.o \ advlib_gridctrl.o \ advlib_gridsel.o \ @@ -10546,6 +10555,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 = \ advlib_calctrl.o \ advlib_datavgen.o \ advlib_datectlg.o \ + advlib_editlbox.o \ advlib_grid.o \ advlib_gridctrl.o \ advlib_gridsel.o \ @@ -17228,6 +17238,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_datectlg.o: $(srcdir)/src/generic/datectlg.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/datectlg.cpp +@COND_USE_GUI_1@monodll_editlbox.o: $(srcdir)/src/generic/editlbox.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/editlbox.cpp + @COND_USE_GUI_1@monodll_grid.o: $(srcdir)/src/generic/grid.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/grid.cpp @@ -21431,6 +21444,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_datectlg.o: $(srcdir)/src/generic/datectlg.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/datectlg.cpp +@COND_USE_GUI_1@monolib_editlbox.o: $(srcdir)/src/generic/editlbox.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/editlbox.cpp + @COND_USE_GUI_1@monolib_grid.o: $(srcdir)/src/generic/grid.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/grid.cpp @@ -28994,6 +29010,9 @@ advdll_datavgen.o: $(srcdir)/src/generic/datavgen.cpp $(ADVDLL_ODEP) advdll_datectlg.o: $(srcdir)/src/generic/datectlg.cpp $(ADVDLL_ODEP) $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/datectlg.cpp +advdll_editlbox.o: $(srcdir)/src/generic/editlbox.cpp $(ADVDLL_ODEP) + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/editlbox.cpp + advdll_grid.o: $(srcdir)/src/generic/grid.cpp $(ADVDLL_ODEP) $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/grid.cpp @@ -29210,6 +29229,9 @@ advlib_datavgen.o: $(srcdir)/src/generic/datavgen.cpp $(ADVLIB_ODEP) advlib_datectlg.o: $(srcdir)/src/generic/datectlg.cpp $(ADVLIB_ODEP) $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/datectlg.cpp +advlib_editlbox.o: $(srcdir)/src/generic/editlbox.cpp $(ADVLIB_ODEP) + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/editlbox.cpp + advlib_grid.o: $(srcdir)/src/generic/grid.cpp $(ADVLIB_ODEP) $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/grid.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 9227f7d5bf..8ab26e3520 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -2677,7 +2677,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/calctrl.cpp src/generic/datavgen.cpp src/generic/datectlg.cpp - + src/generic/editlbox.cpp src/generic/grid.cpp src/generic/gridctrl.cpp src/generic/gridsel.cpp @@ -2701,7 +2701,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/dataview.h wx/dateevt.h wx/dcbuffer.h - + wx/editlbox.h wx/generic/aboutdlgg.h wx/generic/animate.h wx/generic/bmpcbox.h diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index d62fd3818b..4194f9d9d3 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1945,6 +1945,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_calctrl.obj \ $(OBJS)\monodll_datavgen.obj \ $(OBJS)\monodll_datectlg.obj \ + $(OBJS)\monodll_editlbox.obj \ $(OBJS)\monodll_grid.obj \ $(OBJS)\monodll_gridctrl.obj \ $(OBJS)\monodll_gridsel.obj \ @@ -1975,6 +1976,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_calctrl.obj \ $(OBJS)\monodll_datavgen.obj \ $(OBJS)\monodll_datectlg.obj \ + $(OBJS)\monodll_editlbox.obj \ $(OBJS)\monodll_grid.obj \ $(OBJS)\monodll_gridctrl.obj \ $(OBJS)\monodll_gridsel.obj \ @@ -2572,6 +2574,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_calctrl.obj \ $(OBJS)\monolib_datavgen.obj \ $(OBJS)\monolib_datectlg.obj \ + $(OBJS)\monolib_editlbox.obj \ $(OBJS)\monolib_grid.obj \ $(OBJS)\monolib_gridctrl.obj \ $(OBJS)\monolib_gridsel.obj \ @@ -2602,6 +2605,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_calctrl.obj \ $(OBJS)\monolib_datavgen.obj \ $(OBJS)\monolib_datectlg.obj \ + $(OBJS)\monolib_editlbox.obj \ $(OBJS)\monolib_grid.obj \ $(OBJS)\monolib_gridctrl.obj \ $(OBJS)\monolib_gridsel.obj \ @@ -3583,6 +3587,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_calctrl.obj \ $(OBJS)\advdll_datavgen.obj \ $(OBJS)\advdll_datectlg.obj \ + $(OBJS)\advdll_editlbox.obj \ $(OBJS)\advdll_grid.obj \ $(OBJS)\advdll_gridctrl.obj \ $(OBJS)\advdll_gridsel.obj \ @@ -3613,6 +3618,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_calctrl.obj \ $(OBJS)\advdll_datavgen.obj \ $(OBJS)\advdll_datectlg.obj \ + $(OBJS)\advdll_editlbox.obj \ $(OBJS)\advdll_grid.obj \ $(OBJS)\advdll_gridctrl.obj \ $(OBJS)\advdll_gridsel.obj \ @@ -3646,6 +3652,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_calctrl.obj \ $(OBJS)\advlib_datavgen.obj \ $(OBJS)\advlib_datectlg.obj \ + $(OBJS)\advlib_editlbox.obj \ $(OBJS)\advlib_grid.obj \ $(OBJS)\advlib_gridctrl.obj \ $(OBJS)\advlib_gridsel.obj \ @@ -3676,6 +3683,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_calctrl.obj \ $(OBJS)\advlib_datavgen.obj \ $(OBJS)\advlib_datectlg.obj \ + $(OBJS)\advlib_editlbox.obj \ $(OBJS)\advlib_grid.obj \ $(OBJS)\advlib_gridctrl.obj \ $(OBJS)\advlib_gridsel.obj \ @@ -7124,6 +7132,11 @@ $(OBJS)\monodll_datectlg.obj: ..\..\src\generic\datectlg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_editlbox.obj: ..\..\src\generic\editlbox.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_grid.obj: ..\..\src\generic\grid.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -9180,6 +9193,11 @@ $(OBJS)\monolib_datectlg.obj: ..\..\src\generic\datectlg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_editlbox.obj: ..\..\src\generic\editlbox.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_grid.obj: ..\..\src\generic\grid.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -12556,6 +12574,9 @@ $(OBJS)\advdll_datavgen.obj: ..\..\src\generic\datavgen.cpp $(OBJS)\advdll_datectlg.obj: ..\..\src\generic\datectlg.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** +$(OBJS)\advdll_editlbox.obj: ..\..\src\generic\editlbox.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + $(OBJS)\advdll_grid.obj: ..\..\src\generic\grid.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** @@ -12640,6 +12661,9 @@ $(OBJS)\advlib_datavgen.obj: ..\..\src\generic\datavgen.cpp $(OBJS)\advlib_datectlg.obj: ..\..\src\generic\datectlg.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** +$(OBJS)\advlib_editlbox.obj: ..\..\src\generic\editlbox.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + $(OBJS)\advlib_grid.obj: ..\..\src\generic\grid.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 412106371b..688b5fe690 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1958,6 +1958,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_calctrl.o \ $(OBJS)\monodll_datavgen.o \ $(OBJS)\monodll_datectlg.o \ + $(OBJS)\monodll_editlbox.o \ $(OBJS)\monodll_grid.o \ $(OBJS)\monodll_gridctrl.o \ $(OBJS)\monodll_gridsel.o \ @@ -1988,6 +1989,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_calctrl.o \ $(OBJS)\monodll_datavgen.o \ $(OBJS)\monodll_datectlg.o \ + $(OBJS)\monodll_editlbox.o \ $(OBJS)\monodll_grid.o \ $(OBJS)\monodll_gridctrl.o \ $(OBJS)\monodll_gridsel.o \ @@ -2591,6 +2593,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_calctrl.o \ $(OBJS)\monolib_datavgen.o \ $(OBJS)\monolib_datectlg.o \ + $(OBJS)\monolib_editlbox.o \ $(OBJS)\monolib_grid.o \ $(OBJS)\monolib_gridctrl.o \ $(OBJS)\monolib_gridsel.o \ @@ -2621,6 +2624,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_calctrl.o \ $(OBJS)\monolib_datavgen.o \ $(OBJS)\monolib_datectlg.o \ + $(OBJS)\monolib_editlbox.o \ $(OBJS)\monolib_grid.o \ $(OBJS)\monolib_gridctrl.o \ $(OBJS)\monolib_gridsel.o \ @@ -3630,6 +3634,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_calctrl.o \ $(OBJS)\advdll_datavgen.o \ $(OBJS)\advdll_datectlg.o \ + $(OBJS)\advdll_editlbox.o \ $(OBJS)\advdll_grid.o \ $(OBJS)\advdll_gridctrl.o \ $(OBJS)\advdll_gridsel.o \ @@ -3660,6 +3665,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_calctrl.o \ $(OBJS)\advdll_datavgen.o \ $(OBJS)\advdll_datectlg.o \ + $(OBJS)\advdll_editlbox.o \ $(OBJS)\advdll_grid.o \ $(OBJS)\advdll_gridctrl.o \ $(OBJS)\advdll_gridsel.o \ @@ -3697,6 +3703,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_calctrl.o \ $(OBJS)\advlib_datavgen.o \ $(OBJS)\advlib_datectlg.o \ + $(OBJS)\advlib_editlbox.o \ $(OBJS)\advlib_grid.o \ $(OBJS)\advlib_gridctrl.o \ $(OBJS)\advlib_gridsel.o \ @@ -3727,6 +3734,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_calctrl.o \ $(OBJS)\advlib_datavgen.o \ $(OBJS)\advlib_datectlg.o \ + $(OBJS)\advlib_editlbox.o \ $(OBJS)\advlib_grid.o \ $(OBJS)\advlib_gridctrl.o \ $(OBJS)\advlib_gridsel.o \ @@ -7385,6 +7393,11 @@ $(OBJS)\monodll_datectlg.o: ../../src/generic/datectlg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_editlbox.o: ../../src/generic/editlbox.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_grid.o: ../../src/generic/grid.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -9541,6 +9554,11 @@ $(OBJS)\monolib_datectlg.o: ../../src/generic/datectlg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_editlbox.o: ../../src/generic/editlbox.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_grid.o: ../../src/generic/grid.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -13117,6 +13135,9 @@ $(OBJS)\advdll_datavgen.o: ../../src/generic/datavgen.cpp $(OBJS)\advdll_datectlg.o: ../../src/generic/datectlg.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\advdll_editlbox.o: ../../src/generic/editlbox.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advdll_grid.o: ../../src/generic/grid.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< @@ -13201,6 +13222,9 @@ $(OBJS)\advlib_datavgen.o: ../../src/generic/datavgen.cpp $(OBJS)\advlib_datectlg.o: ../../src/generic/datectlg.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\advlib_editlbox.o: ../../src/generic/editlbox.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advlib_grid.o: ../../src/generic/grid.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 99d9f8d82e..098d251fa4 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -2123,6 +2123,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_calctrl.obj \ $(OBJS)\monodll_datavgen.obj \ $(OBJS)\monodll_datectlg.obj \ + $(OBJS)\monodll_editlbox.obj \ $(OBJS)\monodll_grid.obj \ $(OBJS)\monodll_gridctrl.obj \ $(OBJS)\monodll_gridsel.obj \ @@ -2153,6 +2154,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_calctrl.obj \ $(OBJS)\monodll_datavgen.obj \ $(OBJS)\monodll_datectlg.obj \ + $(OBJS)\monodll_editlbox.obj \ $(OBJS)\monodll_grid.obj \ $(OBJS)\monodll_gridctrl.obj \ $(OBJS)\monodll_gridsel.obj \ @@ -2756,6 +2758,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_calctrl.obj \ $(OBJS)\monolib_datavgen.obj \ $(OBJS)\monolib_datectlg.obj \ + $(OBJS)\monolib_editlbox.obj \ $(OBJS)\monolib_grid.obj \ $(OBJS)\monolib_gridctrl.obj \ $(OBJS)\monolib_gridsel.obj \ @@ -2786,6 +2789,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_calctrl.obj \ $(OBJS)\monolib_datavgen.obj \ $(OBJS)\monolib_datectlg.obj \ + $(OBJS)\monolib_editlbox.obj \ $(OBJS)\monolib_grid.obj \ $(OBJS)\monolib_gridctrl.obj \ $(OBJS)\monolib_gridsel.obj \ @@ -3809,6 +3813,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_calctrl.obj \ $(OBJS)\advdll_datavgen.obj \ $(OBJS)\advdll_datectlg.obj \ + $(OBJS)\advdll_editlbox.obj \ $(OBJS)\advdll_grid.obj \ $(OBJS)\advdll_gridctrl.obj \ $(OBJS)\advdll_gridsel.obj \ @@ -3839,6 +3844,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_calctrl.obj \ $(OBJS)\advdll_datavgen.obj \ $(OBJS)\advdll_datectlg.obj \ + $(OBJS)\advdll_editlbox.obj \ $(OBJS)\advdll_grid.obj \ $(OBJS)\advdll_gridctrl.obj \ $(OBJS)\advdll_gridsel.obj \ @@ -3878,6 +3884,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_calctrl.obj \ $(OBJS)\advlib_datavgen.obj \ $(OBJS)\advlib_datectlg.obj \ + $(OBJS)\advlib_editlbox.obj \ $(OBJS)\advlib_grid.obj \ $(OBJS)\advlib_gridctrl.obj \ $(OBJS)\advlib_gridsel.obj \ @@ -3908,6 +3915,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_calctrl.obj \ $(OBJS)\advlib_datavgen.obj \ $(OBJS)\advlib_datectlg.obj \ + $(OBJS)\advlib_editlbox.obj \ $(OBJS)\advlib_grid.obj \ $(OBJS)\advlib_gridctrl.obj \ $(OBJS)\advlib_gridsel.obj \ @@ -7476,6 +7484,11 @@ $(OBJS)\monodll_datectlg.obj: ..\..\src\generic\datectlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_editlbox.obj: ..\..\src\generic\editlbox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_grid.obj: ..\..\src\generic\grid.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -9532,6 +9545,11 @@ $(OBJS)\monolib_datectlg.obj: ..\..\src\generic\datectlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_editlbox.obj: ..\..\src\generic\editlbox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_grid.obj: ..\..\src\generic\grid.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -12908,6 +12926,9 @@ $(OBJS)\advdll_datavgen.obj: ..\..\src\generic\datavgen.cpp $(OBJS)\advdll_datectlg.obj: ..\..\src\generic\datectlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** +$(OBJS)\advdll_editlbox.obj: ..\..\src\generic\editlbox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + $(OBJS)\advdll_grid.obj: ..\..\src\generic\grid.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** @@ -12992,6 +13013,9 @@ $(OBJS)\advlib_datavgen.obj: ..\..\src\generic\datavgen.cpp $(OBJS)\advlib_datectlg.obj: ..\..\src\generic\datectlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** +$(OBJS)\advlib_editlbox.obj: ..\..\src\generic\editlbox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + $(OBJS)\advlib_grid.obj: ..\..\src\generic\grid.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index 04c24e2426..19a639f945 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -681,6 +681,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_calctrl.obj & $(OBJS)\monodll_datavgen.obj & $(OBJS)\monodll_datectlg.obj & + $(OBJS)\monodll_editlbox.obj & $(OBJS)\monodll_grid.obj & $(OBJS)\monodll_gridctrl.obj & $(OBJS)\monodll_gridsel.obj & @@ -711,6 +712,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_calctrl.obj & $(OBJS)\monodll_datavgen.obj & $(OBJS)\monodll_datectlg.obj & + $(OBJS)\monodll_editlbox.obj & $(OBJS)\monodll_grid.obj & $(OBJS)\monodll_gridctrl.obj & $(OBJS)\monodll_gridsel.obj & @@ -1318,6 +1320,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_calctrl.obj & $(OBJS)\monolib_datavgen.obj & $(OBJS)\monolib_datectlg.obj & + $(OBJS)\monolib_editlbox.obj & $(OBJS)\monolib_grid.obj & $(OBJS)\monolib_gridctrl.obj & $(OBJS)\monolib_gridsel.obj & @@ -1348,6 +1351,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_calctrl.obj & $(OBJS)\monolib_datavgen.obj & $(OBJS)\monolib_datectlg.obj & + $(OBJS)\monolib_editlbox.obj & $(OBJS)\monolib_grid.obj & $(OBJS)\monolib_gridctrl.obj & $(OBJS)\monolib_gridsel.obj & @@ -2373,6 +2377,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\advdll_calctrl.obj & $(OBJS)\advdll_datavgen.obj & $(OBJS)\advdll_datectlg.obj & + $(OBJS)\advdll_editlbox.obj & $(OBJS)\advdll_grid.obj & $(OBJS)\advdll_gridctrl.obj & $(OBJS)\advdll_gridsel.obj & @@ -2403,6 +2408,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\advdll_calctrl.obj & $(OBJS)\advdll_datavgen.obj & $(OBJS)\advdll_datectlg.obj & + $(OBJS)\advdll_editlbox.obj & $(OBJS)\advdll_grid.obj & $(OBJS)\advdll_gridctrl.obj & $(OBJS)\advdll_gridsel.obj & @@ -2442,6 +2448,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\advlib_calctrl.obj & $(OBJS)\advlib_datavgen.obj & $(OBJS)\advlib_datectlg.obj & + $(OBJS)\advlib_editlbox.obj & $(OBJS)\advlib_grid.obj & $(OBJS)\advlib_gridctrl.obj & $(OBJS)\advlib_gridsel.obj & @@ -2472,6 +2479,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\advlib_calctrl.obj & $(OBJS)\advlib_datavgen.obj & $(OBJS)\advlib_datectlg.obj & + $(OBJS)\advlib_editlbox.obj & $(OBJS)\advlib_grid.obj & $(OBJS)\advlib_gridctrl.obj & $(OBJS)\advlib_gridsel.obj & @@ -7656,6 +7664,11 @@ $(OBJS)\monodll_datectlg.obj : .AUTODEPEND ..\..\src\generic\datectlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_editlbox.obj : .AUTODEPEND ..\..\src\generic\editlbox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_grid.obj : .AUTODEPEND ..\..\src\generic\grid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -9812,6 +9825,11 @@ $(OBJS)\monolib_datectlg.obj : .AUTODEPEND ..\..\src\generic\datectlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_editlbox.obj : .AUTODEPEND ..\..\src\generic\editlbox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_grid.obj : .AUTODEPEND ..\..\src\generic\grid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -13388,6 +13406,9 @@ $(OBJS)\advdll_datavgen.obj : .AUTODEPEND ..\..\src\generic\datavgen.cpp $(OBJS)\advdll_datectlg.obj : .AUTODEPEND ..\..\src\generic\datectlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< +$(OBJS)\advdll_editlbox.obj : .AUTODEPEND ..\..\src\generic\editlbox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + $(OBJS)\advdll_grid.obj : .AUTODEPEND ..\..\src\generic\grid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< @@ -13472,6 +13493,9 @@ $(OBJS)\advlib_datavgen.obj : .AUTODEPEND ..\..\src\generic\datavgen.cpp $(OBJS)\advlib_datectlg.obj : .AUTODEPEND ..\..\src\generic\datectlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< +$(OBJS)\advlib_editlbox.obj : .AUTODEPEND ..\..\src\generic\editlbox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + $(OBJS)\advlib_grid.obj : .AUTODEPEND ..\..\src\generic\grid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp index c96d594e6b..9de52b4868 100644 --- a/build/msw/wx_adv.dsp +++ b/build/msw/wx_adv.dsp @@ -648,6 +648,10 @@ SOURCE=..\..\src\generic\datectlg.cpp # End Source File # Begin Source File +SOURCE=..\..\src\generic\editlbox.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\generic\grid.cpp # End Source File # Begin Source File @@ -1265,6 +1269,10 @@ SOURCE=..\..\include\wx\dcbuffer.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\editlbox.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\grid.h # End Source File # Begin Source File diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index bcb28a60f4..104d4d6023 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -8893,6 +8893,10 @@ SOURCE=..\..\include\wx\dragimag.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\editlbox.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\effects.h # End Source File # Begin Source File diff --git a/include/wx/editlbox.h b/include/wx/editlbox.h new file mode 100644 index 0000000000..6b90901bc9 --- /dev/null +++ b/include/wx/editlbox.h @@ -0,0 +1,66 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/editlbox.h +// Purpose: ListBox with editable items +// Author: Vaclav Slavik +// RCS-ID: $Id$ +// Copyright: (c) Vaclav Slavik +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + + +#ifndef __WX_EDITLBOX_H__ +#define __WX_EDITLBOX_H__ + +#include "wx/panel.h" + +class WXDLLEXPORT wxBitmapButton; +class WXDLLEXPORT wxListCtrl; +class WXDLLEXPORT wxListEvent; + +#define wxEL_ALLOW_NEW 0x0100 +#define wxEL_ALLOW_EDIT 0x0200 +#define wxEL_ALLOW_DELETE 0x0400 +#define wxEL_NO_REORDER 0x0800 + +// This class provides a composite control that lets the +// user easily enter list of strings + +class WXDLLIMPEXP_ADV wxEditableListBox : public wxPanel +{ +public: + wxEditableListBox(wxWindow *parent, wxWindowID id, + const wxString& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxEL_ALLOW_NEW | wxEL_ALLOW_EDIT | wxEL_ALLOW_DELETE, + const wxString& name = wxT("editableListBox")); + + void SetStrings(const wxArrayString& strings); + void GetStrings(wxArrayString& strings) const; + + wxListCtrl* GetListCtrl() { return m_listCtrl; } + wxBitmapButton* GetDelButton() { return m_bDel; } + wxBitmapButton* GetNewButton() { return m_bNew; } + wxBitmapButton* GetUpButton() { return m_bUp; } + wxBitmapButton* GetDownButton() { return m_bDown; } + wxBitmapButton* GetEditButton() { return m_bEdit; } + +protected: + wxBitmapButton *m_bDel, *m_bNew, *m_bUp, *m_bDown, *m_bEdit; + wxListCtrl *m_listCtrl; + int m_selection; + long m_style; + + void OnItemSelected(wxListEvent& event); + void OnEndLabelEdit(wxListEvent& event); + void OnNewItem(wxCommandEvent& event); + void OnDelItem(wxCommandEvent& event); + void OnEditItem(wxCommandEvent& event); + void OnUpItem(wxCommandEvent& event); + void OnDownItem(wxCommandEvent& event); + + DECLARE_CLASS(wxEditableListBox) + DECLARE_EVENT_TABLE() +}; + +#endif // __WX_EDITLBOX_H__ diff --git a/samples/editlbox/Makefile.in b/samples/editlbox/Makefile.in new file mode 100644 index 0000000000..7205d4ae21 --- /dev/null +++ b/samples/editlbox/Makefile.in @@ -0,0 +1,198 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.2 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + + +@MAKE_SET@ + +prefix = @prefix@ +exec_prefix = @exec_prefix@ +INSTALL = @INSTALL@ +EXEEXT = @EXEEXT@ +WINDRES = @WINDRES@ +REZ = @REZ@ +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_GUI = @EXTRALIBS_GUI@ +EXTRALIBS_SDL = @EXTRALIBS_SDL@ +HOST_SUFFIX = @HOST_SUFFIX@ +SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ +wx_top_builddir = @wx_top_builddir@ + +### Variables: ### + +DESTDIR = +WX_RELEASE = 2.9 +WX_VERSION = $(WX_RELEASE).0 +LIBDIRNAME = $(wx_top_builddir)/lib +EDITLBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +EDITLBOX_OBJECTS = \ + $(__editlbox___win32rc) \ + $(__editlbox_os2_lib_res) \ + editlbox_editlbox.o + +### Conditionally set variables: ### + +@COND_DEPS_TRACKING_0@CXXC = $(CXX) +@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) +@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL) +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_TOOLKIT_MAC@WXBASEPORT = _carbon +@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_DEBUG_FLAG_1@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) $(EXTRALIBS_GUI) +@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) +@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = +@COND_PLATFORM_MAC_1@__editlbox___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C editlbox$(EXEEXT) +@COND_PLATFORM_MAC_1@__editlbox___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_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_1 = -d wxNO_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_1 = -d wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +COND_PLATFORM_OS2_1___editlbox___os2_emxbindcmd = $(NM) editlbox$(EXEEXT) | if \ + grep -q pmwin.763 ; then emxbind -ep editlbox$(EXEEXT) ; fi +@COND_PLATFORM_OS2_1@__editlbox___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___editlbox___os2_emxbindcmd) +@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ +@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) +@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) +@COND_PLATFORM_WIN32_1@__editlbox___win32rc = editlbox_sample_rc.o +@COND_PLATFORM_OS2_1@__editlbox_os2_lib_res = \ +@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res +@COND_PLATFORM_MACOSX_1@__editlbox_bundle___depname = editlbox_bundle +@COND_TOOLKIT_COCOA@____editlbox_BUNDLE_TGT_REF_DEP = \ +@COND_TOOLKIT_COCOA@ editlbox.app/Contents/PkgInfo +@COND_TOOLKIT_MAC@____editlbox_BUNDLE_TGT_REF_DEP = \ +@COND_TOOLKIT_MAC@ editlbox.app/Contents/PkgInfo +COND_MONOLITHIC_0___WXLIB_ADV_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p) +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_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_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_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(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) +COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ + $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ + editlbox$(EXEEXT) Carbon.r sample.r +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) + +### Targets: ### + +all: editlbox$(EXEEXT) $(__editlbox_bundle___depname) + +install: all + +uninstall: + +install-strip: install + +clean: + rm -rf ./.deps ./.pch + rm -f ./*.o + rm -f editlbox$(EXEEXT) + rm -rf editlbox.app + +distclean: clean + rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile + +editlbox$(EXEEXT): $(EDITLBOX_OBJECTS) $(__editlbox___win32rc) + $(CXX) -o $@ $(EDITLBOX_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) + $(__editlbox___mac_rezcmd) + $(__editlbox___mac_setfilecmd) + $(__editlbox___os2_emxbindcmd) + $(SAMPLES_RPATH_POSTLINK) + +editlbox.app/Contents/PkgInfo: editlbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns + mkdir -p editlbox.app/Contents + mkdir -p editlbox.app/Contents/MacOS + mkdir -p editlbox.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/editlbox/" \ + -e "s/VERSION/$(WX_VERSION)/" \ + $(top_srcdir)/src/mac/carbon/Info.plist.in >editlbox.app/Contents/Info.plist + + + echo -n "APPL????" >editlbox.app/Contents/PkgInfo + + + ln -f editlbox$(EXEEXT) editlbox.app/Contents/MacOS/editlbox + + + cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns editlbox.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@editlbox_bundle: $(____editlbox_BUNDLE_TGT_REF_DEP) + +editlbox_sample_rc.o: $(srcdir)/../../samples/sample.rc + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_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 + +editlbox_editlbox.o: $(srcdir)/editlbox.cpp + $(CXXC) -c -o $@ $(EDITLBOX_CXXFLAGS) $(srcdir)/editlbox.cpp + + +# Include dependency info, if present: +@IF_GNU_MAKE@-include .deps/*.d + +.PHONY: all install uninstall clean distclean editlbox_bundle diff --git a/samples/editlbox/editlbox.bkl b/samples/editlbox/editlbox.bkl new file mode 100644 index 0000000000..d999e2d55f --- /dev/null +++ b/samples/editlbox/editlbox.bkl @@ -0,0 +1,12 @@ + + + + + + editlbox.cpp + adv + core + base + + + diff --git a/samples/editlbox/editlbox.cpp b/samples/editlbox/editlbox.cpp new file mode 100644 index 0000000000..66a91d19fe --- /dev/null +++ b/samples/editlbox/editlbox.cpp @@ -0,0 +1,64 @@ +// For compilers that support precompilation, includes "wx/wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +// for all others, include the necessary headers (this file is usually all you +// need because it includes almost all "standard" wxWidgets headers) +#ifndef WX_PRECOMP + #include "wx/wx.h" +#endif + +#include "wx/editlbox.h" +#include "wx/sizer.h" + +class MyApp : public wxApp +{ +public: + virtual bool OnInit(); +}; + +IMPLEMENT_APP(MyApp) + + +bool MyApp::OnInit() +{ + wxDialog dlg(NULL, wxID_ANY, _("Test dialog"), wxDefaultPosition, wxDefaultSize, + wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER); + + wxSizer *sizer = new wxBoxSizer(wxVERTICAL); + sizer->Add(new wxEditableListBox(&dlg, wxID_ANY, _("Match these wildcards:"), + wxDefaultPosition,wxSize(300,200)), + 1, wxEXPAND|wxALL, 10); + + sizer->Add(5,5); + + wxEditableListBox *lb = new wxEditableListBox(&dlg, wxID_ANY, _("Except:"), + wxDefaultPosition,wxSize(300,200)); + wxArrayString ar; + ar.Add(_T("*.cpp")); + ar.Add(_T("*.h")); + ar.Add(_T("*.c")); + lb->SetStrings(ar); + + sizer->Add(lb, 1, wxEXPAND|wxALL, 10); + + sizer->Add(5,5); + + sizer->Add(new wxButton(&dlg, wxID_OK, _("OK")), 0, wxALIGN_RIGHT | wxALL, 10); + dlg.SetSizer(sizer); + sizer->Fit(&dlg); + dlg.Centre(); + + dlg.ShowModal(); + + wxString res = _("'Except' contains these strings:\n\n"); + lb->GetStrings(ar); + for (size_t i = 0; i < ar.GetCount(); i++) + res << ar[i] << _T("\n"); + wxMessageBox(res); + + return false; +} diff --git a/samples/editlbox/editlbox.dsp b/samples/editlbox/editlbox.dsp new file mode 100644 index 0000000000..cb0834619a --- /dev/null +++ b/samples/editlbox/editlbox.dsp @@ -0,0 +1,480 @@ +# Microsoft Developer Studio Project File - Name="editlbox" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Application" 0x0101 + +CFG=editlbox - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "editlbox.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "editlbox.mak" CFG="editlbox - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "editlbox - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application") +!MESSAGE "editlbox - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application") +!MESSAGE "editlbox - Win32 DLL Universal Release" (based on "Win32 (x86) Application") +!MESSAGE "editlbox - Win32 DLL Universal Debug" (based on "Win32 (x86) Application") +!MESSAGE "editlbox - Win32 DLL Unicode Release" (based on "Win32 (x86) Application") +!MESSAGE "editlbox - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application") +!MESSAGE "editlbox - Win32 DLL Release" (based on "Win32 (x86) Application") +!MESSAGE "editlbox - Win32 DLL Debug" (based on "Win32 (x86) Application") +!MESSAGE "editlbox - Win32 Universal Unicode Release" (based on "Win32 (x86) Application") +!MESSAGE "editlbox - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application") +!MESSAGE "editlbox - Win32 Universal Release" (based on "Win32 (x86) Application") +!MESSAGE "editlbox - Win32 Universal Debug" (based on "Win32 (x86) Application") +!MESSAGE "editlbox - Win32 Unicode Release" (based on "Win32 (x86) Application") +!MESSAGE "editlbox - Win32 Unicode Debug" (based on "Win32 (x86) Application") +!MESSAGE "editlbox - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "editlbox - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "editlbox - Win32 DLL Universal Unicode Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "vc_mswunivudll" +# PROP BASE Intermediate_Dir "vc_mswunivudll\editlbox" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "vc_mswunivudll" +# PROP Intermediate_Dir "vc_mswunivudll\editlbox" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\editlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\editlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\editlbox.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\editlbox.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows + +!ELSEIF "$(CFG)" == "editlbox - Win32 DLL Universal Unicode Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswunivuddll" +# PROP BASE Intermediate_Dir "vc_mswunivuddll\editlbox" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswunivuddll" +# PROP Intermediate_Dir "vc_mswunivuddll\editlbox" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\editlbox.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\editlbox.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\editlbox.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\editlbox.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows + +!ELSEIF "$(CFG)" == "editlbox - Win32 DLL Universal Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "vc_mswunivdll" +# PROP BASE Intermediate_Dir "vc_mswunivdll\editlbox" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "vc_mswunivdll" +# PROP Intermediate_Dir "vc_mswunivdll\editlbox" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\editlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswuniv" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\editlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswuniv" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\lib\vc_dll\mswuniv" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\lib\vc_dll\mswuniv" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv29_adv.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\editlbox.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmswuniv29_adv.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\editlbox.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows + +!ELSEIF "$(CFG)" == "editlbox - Win32 DLL Universal Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswunivddll" +# PROP BASE Intermediate_Dir "vc_mswunivddll\editlbox" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswunivddll" +# PROP Intermediate_Dir "vc_mswunivddll\editlbox" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\editlbox.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\editlbox.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_dll\mswunivd" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_dll\mswunivd" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv29d_adv.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\editlbox.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmswuniv29d_adv.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\editlbox.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows + +!ELSEIF "$(CFG)" == "editlbox - Win32 DLL Unicode Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "vc_mswudll" +# PROP BASE Intermediate_Dir "vc_mswudll\editlbox" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "vc_mswudll" +# PROP Intermediate_Dir "vc_mswudll\editlbox" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\editlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Fdvc_mswudll\editlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\editlbox.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\editlbox.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows + +!ELSEIF "$(CFG)" == "editlbox - Win32 DLL Unicode Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswuddll" +# PROP BASE Intermediate_Dir "vc_mswuddll\editlbox" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswuddll" +# PROP Intermediate_Dir "vc_mswuddll\editlbox" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\editlbox.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\editlbox.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\editlbox.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\editlbox.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows + +!ELSEIF "$(CFG)" == "editlbox - Win32 DLL Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "vc_mswdll" +# PROP BASE Intermediate_Dir "vc_mswdll\editlbox" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "vc_mswdll" +# PROP Intermediate_Dir "vc_mswdll\editlbox" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\editlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\msw" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Fdvc_mswdll\editlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\msw" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\lib\vc_dll\msw" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\lib\vc_dll\msw" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw29_adv.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\editlbox.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmsw29_adv.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\editlbox.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows + +!ELSEIF "$(CFG)" == "editlbox - Win32 DLL Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswddll" +# PROP BASE Intermediate_Dir "vc_mswddll\editlbox" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswddll" +# PROP Intermediate_Dir "vc_mswddll\editlbox" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\editlbox.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\editlbox.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_dll\mswd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_dll\mswd" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_dll\mswd" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw29d_adv.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\editlbox.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmsw29d_adv.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\editlbox.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows + +!ELSEIF "$(CFG)" == "editlbox - Win32 Universal Unicode Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "vc_mswunivu" +# PROP BASE Intermediate_Dir "vc_mswunivu\editlbox" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "vc_mswunivu" +# PROP Intermediate_Dir "vc_mswunivu\editlbox" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\editlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\editlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\editlbox.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\editlbox.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows + +!ELSEIF "$(CFG)" == "editlbox - Win32 Universal Unicode Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswunivud" +# PROP BASE Intermediate_Dir "vc_mswunivud\editlbox" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswunivud" +# PROP Intermediate_Dir "vc_mswunivud\editlbox" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\editlbox.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\editlbox.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\editlbox.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\editlbox.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows + +!ELSEIF "$(CFG)" == "editlbox - Win32 Universal Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "vc_mswuniv" +# PROP BASE Intermediate_Dir "vc_mswuniv\editlbox" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "vc_mswuniv" +# PROP Intermediate_Dir "vc_mswuniv\editlbox" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\editlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswuniv" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\editlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswuniv" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\lib\vc_lib\mswuniv" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\lib\vc_lib\mswuniv" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv29_adv.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\editlbox.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmswuniv29_adv.lib wxmswuniv29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\editlbox.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows + +!ELSEIF "$(CFG)" == "editlbox - Win32 Universal Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswunivd" +# PROP BASE Intermediate_Dir "vc_mswunivd\editlbox" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswunivd" +# PROP Intermediate_Dir "vc_mswunivd\editlbox" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\editlbox.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\editlbox.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_lib\mswunivd" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_lib\mswunivd" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv29d_adv.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\editlbox.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmswuniv29d_adv.lib wxmswuniv29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\editlbox.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows + +!ELSEIF "$(CFG)" == "editlbox - Win32 Unicode Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "vc_mswu" +# PROP BASE Intermediate_Dir "vc_mswu\editlbox" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "vc_mswu" +# PROP Intermediate_Dir "vc_mswu\editlbox" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\editlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Fdvc_mswu\editlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\editlbox.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\editlbox.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows + +!ELSEIF "$(CFG)" == "editlbox - Win32 Unicode Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswud" +# PROP BASE Intermediate_Dir "vc_mswud\editlbox" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswud" +# PROP Intermediate_Dir "vc_mswud\editlbox" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\editlbox.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\editlbox.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\editlbox.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\editlbox.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows + +!ELSEIF "$(CFG)" == "editlbox - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "vc_msw" +# PROP BASE Intermediate_Dir "vc_msw\editlbox" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "vc_msw" +# PROP Intermediate_Dir "vc_msw\editlbox" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\editlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\msw" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Fdvc_msw\editlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\msw" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\lib\vc_lib\msw" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\lib\vc_lib\msw" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw29_adv.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\editlbox.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmsw29_adv.lib wxmsw29_core.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\editlbox.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows + +!ELSEIF "$(CFG)" == "editlbox - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswd" +# PROP BASE Intermediate_Dir "vc_mswd\editlbox" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswd" +# PROP Intermediate_Dir "vc_mswd\editlbox" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\editlbox.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\editlbox.pdb /Od /GR /EHsc /I ".\..\..\lib\vc_lib\mswd" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_lib\mswd" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_lib\mswd" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw29d_adv.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\editlbox.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmsw29d_adv.lib wxmsw29d_core.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\editlbox.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows + +!ENDIF + +# Begin Target + +# Name "editlbox - Win32 DLL Universal Unicode Release" +# Name "editlbox - Win32 DLL Universal Unicode Debug" +# Name "editlbox - Win32 DLL Universal Release" +# Name "editlbox - Win32 DLL Universal Debug" +# Name "editlbox - Win32 DLL Unicode Release" +# Name "editlbox - Win32 DLL Unicode Debug" +# Name "editlbox - Win32 DLL Release" +# Name "editlbox - Win32 DLL Debug" +# Name "editlbox - Win32 Universal Unicode Release" +# Name "editlbox - Win32 Universal Unicode Debug" +# Name "editlbox - Win32 Universal Release" +# Name "editlbox - Win32 Universal Debug" +# Name "editlbox - Win32 Unicode Release" +# Name "editlbox - Win32 Unicode Debug" +# Name "editlbox - Win32 Release" +# Name "editlbox - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\editlbox.cpp +# End Source File +# Begin Source File + +SOURCE=.\..\..\samples\sample.rc +# End Source File +# End Group +# End Target +# End Project + diff --git a/samples/editlbox/editlbox.dsw b/samples/editlbox/editlbox.dsw new file mode 100644 index 0000000000..582e456c55 --- /dev/null +++ b/samples/editlbox/editlbox.dsw @@ -0,0 +1,61 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### +Project: "editlbox"=editlbox.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +Begin Project Dependency +Project_Dep_Name adv +End Project Dependency +Begin Project Dependency +Project_Dep_Name core +End Project Dependency +Begin Project Dependency +Project_Dep_Name base +End Project Dependency +}}} + +############################################################################### + +Project: "adv"=..\..\build\msw\wx_adv.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "core"=..\..\build\msw\wx_core.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "base"=..\..\build\msw\wx_base.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + diff --git a/samples/editlbox/makefile.bcc b/samples/editlbox/makefile.bcc new file mode 100644 index 0000000000..b1d32dd069 --- /dev/null +++ b/samples/editlbox/makefile.bcc @@ -0,0 +1,238 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.2 (http://bakefile.sourceforge.net) +# 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 = 29 +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +EDITLBOX_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \ + -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS) +EDITLBOX_OBJECTS = \ + $(OBJS)\editlbox_editlbox.obj + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "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 "$(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 "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!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)" == "1" +__UNICODE_DEFINE_p = -D_UNICODE +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -d_UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_ADV_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!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 "$(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 "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.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)\editlbox.exe + +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)\editlbox.exe del $(OBJS)\editlbox.exe + -if exist $(OBJS)\editlbox.tds del $(OBJS)\editlbox.tds + -if exist $(OBJS)\editlbox.ilc del $(OBJS)\editlbox.ilc + -if exist $(OBJS)\editlbox.ild del $(OBJS)\editlbox.ild + -if exist $(OBJS)\editlbox.ilf del $(OBJS)\editlbox.ilf + -if exist $(OBJS)\editlbox.ils del $(OBJS)\editlbox.ils + +$(OBJS)\editlbox.exe: $(EDITLBOX_OBJECTS) $(OBJS)\editlbox_sample.res + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + c0w32.obj $(EDITLBOX_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\editlbox_sample.res +| + +$(OBJS)\editlbox_sample.res: .\..\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH $** + +$(OBJS)\editlbox_editlbox.obj: .\editlbox.cpp + $(CXX) -q -c -P -o$@ $(EDITLBOX_CXXFLAGS) $** + diff --git a/samples/editlbox/makefile.gcc b/samples/editlbox/makefile.gcc new file mode 100644 index 0000000000..8425a7f788 --- /dev/null +++ b/samples/editlbox/makefile.gcc @@ -0,0 +1,236 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.2 (http://bakefile.sourceforge.net) +# 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 +WX_RELEASE_NODOT = 29 +OBJS = \ + gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +EDITLBOX_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ + $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \ + $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \ + $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) +EDITLBOX_OBJECTS = \ + $(OBJS)\editlbox_sample_rc.o \ + $(OBJS)\editlbox_editlbox.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 +endif +ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +WXDEBUGFLAG = d +endif +endif +ifeq ($(DEBUG_FLAG),1) +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 ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +endif +ifeq ($(DEBUG_FLAG),1) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +__DEBUG_DEFINE_p_1 = --define __WXDEBUG__ +endif +endif +ifeq ($(DEBUG_FLAG),1) +__DEBUG_DEFINE_p_1 = --define __WXDEBUG__ +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),1) +__UNICODE_DEFINE_p = -D_UNICODE +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p_1 = --define _UNICODE +endif +ifeq ($(MSLU),1) +__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 +endif +ifeq ($(MSLU),1) +__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1 +endif +ifeq ($(USE_GDIPLUS),1) +__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 +endif +ifeq ($(USE_GDIPLUS),1) +__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1 +endif +ifeq ($(SHARED),1) +__DLLFLAG_p = -DWXUSINGDLL +endif +ifeq ($(SHARED),1) +__DLLFLAG_p_1 = --define WXUSINGDLL +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_ADV_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv +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 ($(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 ($(MSLU),1) +__UNICOWS_LIB_p = -lunicows +endif +ifeq ($(USE_GDIPLUS),1) +__GDIPLUS_LIB_p = -lgdiplus +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)\editlbox.exe + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist $(OBJS)\*.d del $(OBJS)\*.d + -if exist $(OBJS)\editlbox.exe del $(OBJS)\editlbox.exe + +$(OBJS)\editlbox.exe: $(EDITLBOX_OBJECTS) $(OBJS)\editlbox_sample_rc.o + $(CXX) -o $@ $(EDITLBOX_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 + +$(OBJS)\editlbox_sample_rc.o: ./../../samples/sample.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH + +$(OBJS)\editlbox_editlbox.o: ./editlbox.cpp + $(CXX) -c -o $@ $(EDITLBOX_CXXFLAGS) $(CPPDEPS) $< + +.PHONY: all clean + + +# Dependencies tracking: +-include $(OBJS)/*.d diff --git a/samples/editlbox/makefile.unx b/samples/editlbox/makefile.unx new file mode 100644 index 0000000000..9016135bd8 --- /dev/null +++ b/samples/editlbox/makefile.unx @@ -0,0 +1,110 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.2 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + + + +# ------------------------------------------------------------------------- +# These are configurable options: +# ------------------------------------------------------------------------- + +# C++ compiler +CXX := g++ + +# 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,mgl,mac,dfb] +WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1) + +# Use DLL build of wx library to use? [0,1] +WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi) + +# Compile Unicode build of wxWidgets? [0,1] +WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/') + +# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] +WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/') + +# Version of the wx library to build against. +WX_VERSION := $(shell $(WX_CONFIG) --selected-config | 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 +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_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ + $(WX_CONFIG_SHARED_FLAG) --toolkit=$(WX_PORT) \ + --version=$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) +EDITLBOX_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \ + $(CXXFLAGS) +EDITLBOX_OBJECTS = \ + editlbox_editlbox.o + +### Conditionally set variables: ### + +ifeq ($(WX_DEBUG),0) +WX_CONFIG_DEBUG_FLAG = --debug=no +endif +ifeq ($(WX_DEBUG),1) +WX_CONFIG_DEBUG_FLAG = --debug=yes +endif +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 editlbox + +install: all + +uninstall: + +clean: + rm -f ./*.o + rm -f ./*.d + rm -f editlbox + +test_for_selected_wxbuild: + @$(WX_CONFIG) $(WX_CONFIG_FLAGS) + +editlbox: $(EDITLBOX_OBJECTS) + $(CXX) -o $@ $(EDITLBOX_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` + +editlbox_editlbox.o: ./editlbox.cpp + $(CXX) -c -o $@ $(EDITLBOX_CXXFLAGS) $(CPPDEPS) $< + +.PHONY: all install uninstall clean + + +# Dependencies tracking: +-include ./*.d diff --git a/samples/editlbox/makefile.vc b/samples/editlbox/makefile.vc new file mode 100644 index 0000000000..e945044eed --- /dev/null +++ b/samples/editlbox/makefile.vc @@ -0,0 +1,313 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.2 (http://bakefile.sourceforge.net) +# 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 = 29 +OBJS = \ + vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = .\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +EDITLBOX_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\editlbox.pdb $(____DEBUGRUNTIME_2_p) \ + $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ + $(CPPFLAGS) $(CXXFLAGS) +EDITLBOX_OBJECTS = \ + $(OBJS)\editlbox_sample.res \ + $(OBJS)\editlbox_editlbox.obj + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!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:AMD64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!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_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_2_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_2_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_2_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_2_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_3 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_3 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_3 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_3 = d +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_4 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_4 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_7 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_7 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_8 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_9 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_9 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_10 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_10 = /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 "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p_1 = /d __WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p_1 = /d __WXDEBUG__ +!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)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_ADV_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!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 "$(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 "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\editlbox.exe + +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)\editlbox.exe del $(OBJS)\editlbox.exe + -if exist $(OBJS)\editlbox.ilk del $(OBJS)\editlbox.ilk + -if exist $(OBJS)\editlbox.pdb del $(OBJS)\editlbox.pdb + +$(OBJS)\editlbox.exe: $(EDITLBOX_OBJECTS) $(OBJS)\editlbox_sample.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + $(EDITLBOX_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib +<< + +$(OBJS)\editlbox_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH $** + +$(OBJS)\editlbox_editlbox.obj: .\editlbox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(EDITLBOX_CXXFLAGS) $** + diff --git a/samples/editlbox/makefile.wat b/samples/editlbox/makefile.wat new file mode 100644 index 0000000000..12b8f683b9 --- /dev/null +++ b/samples/editlbox/makefile.wat @@ -0,0 +1,267 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.2 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +WXDEBUGFLAG = d +!endif +!endif +!ifeq DEBUG_FLAG 1 +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +OBJS = & + wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +EDITLBOX_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +EDITLBOX_OBJECTS = & + $(OBJS)\editlbox_editlbox.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\editlbox.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\editlbox.exe del $(OBJS)\editlbox.exe + +$(OBJS)\editlbox.exe : $(EDITLBOX_OBJECTS) $(OBJS)\editlbox_sample.res + @%create $(OBJS)\editlbox.lbc + @%append $(OBJS)\editlbox.lbc option quiet + @%append $(OBJS)\editlbox.lbc name $^@ + @%append $(OBJS)\editlbox.lbc option caseexact + @%append $(OBJS)\editlbox.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @for %i in ($(EDITLBOX_OBJECTS)) do @%append $(OBJS)\editlbox.lbc file %i + @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\editlbox.lbc library %i + @%append $(OBJS)\editlbox.lbc option resource=$(OBJS)\editlbox_sample.res + @for %i in () do @%append $(OBJS)\editlbox.lbc option stack=%i + wlink @$(OBJS)\editlbox.lbc + +$(OBJS)\editlbox_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + +$(OBJS)\editlbox_editlbox.obj : .AUTODEPEND .\editlbox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(EDITLBOX_CXXFLAGS) $< + diff --git a/src/generic/editlbox.cpp b/src/generic/editlbox.cpp new file mode 100644 index 0000000000..b01dcf968d --- /dev/null +++ b/src/generic/editlbox.cpp @@ -0,0 +1,378 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: editlbox.cpp +// Purpose: ListBox with editable items +// Author: Vaclav Slavik +// RCS-ID: $Id$ +// Copyright: (c) Vaclav Slavik +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +// For compilers that support precompilation, includes "wx/wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +// for all others, include the necessary headers (this file is usually all you +// need because it includes almost all "standard" wxWidgets headers) +#ifndef WX_PRECOMP + #include "wx/wx.h" +#endif + +#include "wx/editlbox.h" +#include "wx/sizer.h" +#include "wx/listctrl.h" + +static char * eledit_xpm[] = { +"16 16 3 1", +" c None", +". c #000000", +"+ c #00007F", +" ", +" ", +" .. .. ", +" . ", +" . ", +" ++++ . ++++ ", +" ++ . ++ ++", +" +++++ . ++++++", +" ++ ++ . ++ ", +" ++ ++ . ++ ++", +" +++++ . ++++ ", +" . ", +" . ", +" .. .. ", +" ", +" "}; + +static char * elnew_xpm[] = { +"16 16 5 1", +" c None", +". c #7F7F7F", +"+ c #FFFFFF", +"@ c #FFFF00", +"# c #000000", +" ", +" ", +" . .+ .@ ", +" . .@.@# # # ", +" @.@+.... # ", +" ... @@ ", +" @ . @. # ", +" .# .@ ", +" . # ", +" # ", +" # ", +" # ", +" # ", +" # # # # # # ", +" ", +" "}; + +static char * eldel_xpm[] = { +"16 16 3 1", +" c None", +". c #7F0000", +"+ c #FFFFFF", +" ", +" ", +" ", +" ..+ ..+ ", +" ....+ ..+ ", +" ....+ ..+ ", +" ...+ .+ ", +" .....+ ", +" ...+ ", +" .....+ ", +" ...+ ..+ ", +" ...+ ..+ ", +" ...+ .+ ", +" ...+ .+ ", +" . . ", +" "}; + +static char * eldown_xpm[] = { +"16 16 2 1", +" c None", +". c #000000", +" ", +" ", +" ... ", +" ... ", +" ... ", +" ... ", +" ... ", +" ... ", +" ........... ", +" ......... ", +" ....... ", +" ..... ", +" ... ", +" . ", +" ", +" "}; + +static char * elup_xpm[] = { +"16 16 2 1", +" c None", +". c #000000", +" ", +" . ", +" ... ", +" ..... ", +" ....... ", +" ......... ", +" ........... ", +" ... ", +" ... ", +" ... ", +" ... ", +" ... ", +" ... ", +" ", +" ", +" "}; + +// list control with auto-resizable column: +class CleverListCtrl : public wxListCtrl +{ +public: + CleverListCtrl(wxWindow *parent, + wxWindowID id = wxID_ANY, + const wxPoint &pos = wxDefaultPosition, + const wxSize &size = wxDefaultSize, + long style = wxLC_ICON, + const wxValidator& validator = wxDefaultValidator, + const wxString &name = wxListCtrlNameStr) + : wxListCtrl(parent, id, pos, size, style, validator, name) + { + CreateColumns(); + } + + void CreateColumns() + { + InsertColumn(0, _T("item")); + SizeColumns(); + } + + void SizeColumns() + { + int w = GetSize().x; +#ifdef __WXMSW__ + w -= wxSystemSettings::GetMetric(wxSYS_VSCROLL_X) + 6; +#else + w -= 2*wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); +#endif + SetColumnWidth(0, w); + } + +private: + DECLARE_EVENT_TABLE() + void OnSize(wxSizeEvent& event) + { + SizeColumns(); + event.Skip(); + } +}; + +BEGIN_EVENT_TABLE(CleverListCtrl, wxListCtrl) + EVT_SIZE(CleverListCtrl::OnSize) +END_EVENT_TABLE() + +IMPLEMENT_CLASS(wxEditableListBox, wxPanel) + +// NB: generate the IDs at runtime to avoid conflict with XRCID values, +// they could cause XRCCTRL() failures in XRC-based dialogs +const int wxID_ELB_DELETE = wxNewId(); +const int wxID_ELB_EDIT = wxNewId(); +const int wxID_ELB_NEW = wxNewId(); +const int wxID_ELB_UP = wxNewId(); +const int wxID_ELB_DOWN = wxNewId(); +const int wxID_ELB_LISTCTRL = wxNewId(); + +BEGIN_EVENT_TABLE(wxEditableListBox, wxPanel) + EVT_LIST_ITEM_SELECTED(wxID_ELB_LISTCTRL, wxEditableListBox::OnItemSelected) + EVT_LIST_END_LABEL_EDIT(wxID_ELB_LISTCTRL, wxEditableListBox::OnEndLabelEdit) + EVT_BUTTON(wxID_ELB_NEW, wxEditableListBox::OnNewItem) + EVT_BUTTON(wxID_ELB_UP, wxEditableListBox::OnUpItem) + EVT_BUTTON(wxID_ELB_DOWN, wxEditableListBox::OnDownItem) + EVT_BUTTON(wxID_ELB_EDIT, wxEditableListBox::OnEditItem) + EVT_BUTTON(wxID_ELB_DELETE, wxEditableListBox::OnDelItem) +END_EVENT_TABLE() + +wxEditableListBox::wxEditableListBox(wxWindow *parent, wxWindowID id, + const wxString& label, + const wxPoint& pos, const wxSize& size, + long style, + const wxString& name) + : wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL, name) +{ + m_style = style; + m_bEdit = m_bNew = m_bDel = m_bUp = m_bDown = NULL; + + wxSizer *sizer = new wxBoxSizer(wxVERTICAL); + + wxPanel *subp = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, + wxSUNKEN_BORDER | wxTAB_TRAVERSAL); + wxSizer *subsizer = new wxBoxSizer(wxHORIZONTAL); + subsizer->Add(new wxStaticText(subp, wxID_ANY, label), 1, wxALIGN_CENTRE_VERTICAL | wxLEFT, 4); + +#ifdef __WXMSW__ + #define BTN_BORDER 4 + // FIXME - why is this needed? There's some reason why sunken border is + // ignored by sizers in wxMSW but not in wxGTK that I can't + // figure out... +#else + #define BTN_BORDER 0 +#endif + + if ( m_style & wxEL_ALLOW_EDIT ) + { + m_bEdit = new wxBitmapButton(subp, wxID_ELB_EDIT, wxBitmap(eledit_xpm)); + subsizer->Add(m_bEdit, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER); + } + + if ( m_style & wxEL_ALLOW_NEW ) + { + m_bNew = new wxBitmapButton(subp, wxID_ELB_NEW, wxBitmap(elnew_xpm)); + subsizer->Add(m_bNew, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER); + } + + if ( m_style & wxEL_ALLOW_DELETE ) + { + m_bDel = new wxBitmapButton(subp, wxID_ELB_DELETE, wxBitmap(eldel_xpm)); + subsizer->Add(m_bDel, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER); + } + + if (!(m_style & wxEL_NO_REORDER)) + { + m_bUp = new wxBitmapButton(subp, wxID_ELB_UP, wxBitmap(elup_xpm)); + subsizer->Add(m_bUp, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER); + + m_bDown = new wxBitmapButton(subp, wxID_ELB_DOWN, wxBitmap(eldown_xpm)); + subsizer->Add(m_bDown, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER); + } + +#if wxUSE_TOOLTIPS + if ( m_bEdit ) m_bEdit->SetToolTip(_("Edit item")); + if ( m_bNew ) m_bNew->SetToolTip(_("New item")); + if ( m_bDel ) m_bDel->SetToolTip(_("Delete item")); + if ( m_bUp ) m_bUp->SetToolTip(_("Move up")); + if ( m_bDown ) m_bDown->SetToolTip(_("Move down")); +#endif + + subp->SetSizer(subsizer); + subsizer->Fit(subp); + + sizer->Add(subp, 0, wxEXPAND); + + long st = wxLC_REPORT | wxLC_NO_HEADER | wxLC_SINGLE_SEL | wxSUNKEN_BORDER; + if ( style & wxEL_ALLOW_EDIT ) + st |= wxLC_EDIT_LABELS; + m_listCtrl = new CleverListCtrl(this, wxID_ELB_LISTCTRL, + wxDefaultPosition, wxDefaultSize, st); + wxArrayString empty_ar; + SetStrings(empty_ar); + + sizer->Add(m_listCtrl, 1, wxEXPAND); + + SetSizer(sizer); + Layout(); +} + +void wxEditableListBox::SetStrings(const wxArrayString& strings) +{ + m_listCtrl->DeleteAllItems(); + size_t i; + + for (i = 0; i < strings.GetCount(); i++) + m_listCtrl->InsertItem(i, strings[i]); + + m_listCtrl->InsertItem(strings.GetCount(), wxEmptyString); + m_listCtrl->SetItemState(0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); +} + +void wxEditableListBox::GetStrings(wxArrayString& strings) const +{ + strings.Clear(); + + for (int i = 0; i < m_listCtrl->GetItemCount()-1; i++) + strings.Add(m_listCtrl->GetItemText(i)); +} + +void wxEditableListBox::OnItemSelected(wxListEvent& event) +{ + m_selection = event.GetIndex(); + if (!(m_style & wxEL_NO_REORDER)) + { + m_bUp->Enable(m_selection != 0 && m_selection < m_listCtrl->GetItemCount()-1); + m_bDown->Enable(m_selection < m_listCtrl->GetItemCount()-2); + } + + if (m_style & wxEL_ALLOW_EDIT) + m_bEdit->Enable(m_selection < m_listCtrl->GetItemCount()-1); + if (m_style & wxEL_ALLOW_DELETE) + m_bDel->Enable(m_selection < m_listCtrl->GetItemCount()-1); +} + +void wxEditableListBox::OnNewItem(wxCommandEvent& WXUNUSED(event)) +{ + m_listCtrl->SetItemState(m_listCtrl->GetItemCount()-1, + wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); + m_listCtrl->EditLabel(m_selection); +} + +void wxEditableListBox::OnEndLabelEdit(wxListEvent& event) +{ + if ( event.GetIndex() == m_listCtrl->GetItemCount()-1 && + !event.GetText().empty() ) + { + // The user edited last (empty) line, i.e. added new entry. We have to + // add new empty line here so that adding one more line is still + // possible: + m_listCtrl->InsertItem(m_listCtrl->GetItemCount(), wxEmptyString); + + // Simulate a wxEVT_COMMAND_LIST_ITEM_SELECTED event for the new item, + // so that the buttons are enabled/disabled properly + wxListEvent selectionEvent(wxEVT_COMMAND_LIST_ITEM_SELECTED, m_listCtrl->GetId()); + selectionEvent.m_itemIndex = event.GetIndex(); + m_listCtrl->GetEventHandler()->ProcessEvent(selectionEvent); + } +} + +void wxEditableListBox::OnDelItem(wxCommandEvent& WXUNUSED(event)) +{ + m_listCtrl->DeleteItem(m_selection); + m_listCtrl->SetItemState(m_selection, + wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); +} + +void wxEditableListBox::OnEditItem(wxCommandEvent& WXUNUSED(event)) +{ + m_listCtrl->EditLabel(m_selection); +} + +void wxEditableListBox::OnUpItem(wxCommandEvent& WXUNUSED(event)) +{ + wxString t1, t2; + + t1 = m_listCtrl->GetItemText(m_selection - 1); + t2 = m_listCtrl->GetItemText(m_selection); + m_listCtrl->SetItemText(m_selection - 1, t2); + m_listCtrl->SetItemText(m_selection, t1); + m_listCtrl->SetItemState(m_selection - 1, + wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); +} + +void wxEditableListBox::OnDownItem(wxCommandEvent& WXUNUSED(event)) +{ + wxString t1, t2; + + t1 = m_listCtrl->GetItemText(m_selection + 1); + t2 = m_listCtrl->GetItemText(m_selection); + m_listCtrl->SetItemText(m_selection + 1, t2); + m_listCtrl->SetItemText(m_selection, t1); + m_listCtrl->SetItemState(m_selection + 1, + wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); +} -- 2.45.2