New icon for combobox with bitmaps. Improved readability of icons on dark backgrounds...

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

diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in
index a0b4311c7e99ed0b00ac9b754b5d9d855ec545d5..e7c8b8529331d1bdd7ea0d06feb03be82b63a2ea 100644 (file)
--- a/samples/widgets/Makefile.in
+++ b/samples/widgets/Makefile.in
@@ -48,18 +48,19 @@ WIDGETS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 WIDGETS_OBJECTS =  \
        $(__widgets_os2_lib_res) \
+       widgets_bmpcombobox.o \
        widgets_button.o \
        widgets_checkbox.o \
+       widgets_clrpicker.o \
        widgets_combobox.o \
        widgets_datepick.o \
+       widgets_dirpicker.o \
+       widgets_filepicker.o \
+       widgets_fontpicker.o \
        widgets_gauge.o \
        widgets_hyperlnk.o \
        widgets_listbox.o \
        widgets_notebook.o \
-       widgets_clrpicker.o \
-       widgets_fontpicker.o \
-       widgets_filepicker.o \
-       widgets_dirpicker.o \
        widgets_odcombobox.o \
        widgets_radiobox.o \
        widgets_slider.o \
@@ -210,18 +211,33 @@ widgets.app/Contents/PkgInfo: widgets$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
 
 @COND_PLATFORM_MACOSX_1@widgets_bundle: $(____widgets_BUNDLE_TGT_REF_DEP)
 
+widgets_bmpcombobox.o: $(srcdir)/bmpcombobox.cpp
+       $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/bmpcombobox.cpp
+
 widgets_button.o: $(srcdir)/button.cpp
        $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/button.cpp
 
 widgets_checkbox.o: $(srcdir)/checkbox.cpp
        $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/checkbox.cpp
 
+widgets_clrpicker.o: $(srcdir)/clrpicker.cpp
+       $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/clrpicker.cpp
+
 widgets_combobox.o: $(srcdir)/combobox.cpp
        $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/combobox.cpp
 
 widgets_datepick.o: $(srcdir)/datepick.cpp
        $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/datepick.cpp
 
+widgets_dirpicker.o: $(srcdir)/dirpicker.cpp
+       $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/dirpicker.cpp
+
+widgets_filepicker.o: $(srcdir)/filepicker.cpp
+       $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/filepicker.cpp
+
+widgets_fontpicker.o: $(srcdir)/fontpicker.cpp
+       $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/fontpicker.cpp
+
 widgets_gauge.o: $(srcdir)/gauge.cpp
        $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/gauge.cpp
 
@@ -234,18 +250,6 @@ widgets_listbox.o: $(srcdir)/listbox.cpp
 widgets_notebook.o: $(srcdir)/notebook.cpp
        $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/notebook.cpp
 
-widgets_clrpicker.o: $(srcdir)/clrpicker.cpp
-       $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/clrpicker.cpp
-
-widgets_fontpicker.o: $(srcdir)/fontpicker.cpp
-       $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/fontpicker.cpp
-
-widgets_filepicker.o: $(srcdir)/filepicker.cpp
-       $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/filepicker.cpp
-
-widgets_dirpicker.o: $(srcdir)/dirpicker.cpp
-       $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/dirpicker.cpp
-
 widgets_odcombobox.o: $(srcdir)/odcombobox.cpp
        $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/odcombobox.cpp
 

diff --git a/samples/widgets/bmpcombobox.cpp b/samples/widgets/bmpcombobox.cpp
index ca61907a5c1e1c7753c72819dcceef7aa435d85e..bf92e5333c9e1578f7572eb3552e5e1675ceab42 100644 (file)
--- a/samples/widgets/bmpcombobox.cpp
+++ b/samples/widgets/bmpcombobox.cpp
@@ -54,7 +54,7 @@
 
 #include "widgets.h"
 
-#include "icons/odcombobox.xpm"
+#include "icons/bmpcombobox.xpm"
 
 // Images loaded from file are reduced this width and height, if larger
 #define IMG_SIZE_TRUNC  150
@@ -229,7 +229,7 @@ IMPLEMENT_WIDGETS_PAGE(BitmapComboBoxWidgetsPage, _T("BitmapCombobox"),
 
 BitmapComboBoxWidgetsPage::BitmapComboBoxWidgetsPage(WidgetsBookCtrl *book,
                                              wxImageList *imaglist)
-                  : WidgetsPage(book, imaglist, odcombobox_xpm)
+                  : WidgetsPage(book, imaglist, bmpcombobox_xpm)
 {
     // init everything
     m_chkSort =

diff --git a/samples/widgets/icons/bmpcombobox.xpm b/samples/widgets/icons/bmpcombobox.xpm
new file mode 100644 (file)
index 0000000..920f314
--- /dev/null
+++ b/samples/widgets/icons/bmpcombobox.xpm
@@ -0,0 +1,54 @@
+/* XPM */
+static char *bmpcombobox_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 16 1",
+"  c Gray0",
+". c #808000",
+"X c #000080",
+"o c #808080",
+"O c #000000",
+"+ c #808000",
+"@ c #000080",
+"# c none",
+"$ c #808080",
+"% c Red",
+"& c Green",
+"* c Yellow",
+"= c Blue",
+"- c Magenta",
+"; c Cyan",
+": c Gray100",
+/* pixels */
+"################################",
+"################################",
+"##                            ##",
+"## ::::::::::::::::           ##",
+"## :%%%%:&&&&:====:   :::::   ##",
+"## :%%%%:&&&&:====:    :::    ##",
+"## :%%%%:&&&&:====:     :     ##",
+"## ::::::::::::::::           ##",
+"##                            ##",
+"#### :::::::::::::: ::::::::: ##",
+"#### :     :::::::: ::::::::: ##",
+"#### : %%% : :::::: :::: :::: ##",
+"#### : %%% :: : : : :::   ::: ##",
+"#### : %%% ::: : :: ::     :: ##",
+"#### :     :::::::: ::::::::: ##",
+"#### :::::::::::::: ::::::::: ##",
+"#### :     ::::::::           ##",
+"#### : &&& : : : :: ::::::::: ##",
+"#### : &&& :: :: :: ::::::::: ##",
+"#### : &&& : : : :: ::::::::: ##",
+"#### :     ::::::::           ##",
+"#### :::::::::::::: ::::::::: ##",
+"#### :     :::::::: ::::::::: ##",
+"#### : === :: :: :: ::     :: ##",
+"#### : === :   :: : :::   ::: ##",
+"#### : === :: :: :: :::: :::: ##",
+"#### :     :::::::: ::::::::: ##",
+"#### :::::::::::::: ::::::::: ##",
+"####                          ##",
+"################################",
+"################################",
+"################################"
+};

diff --git a/samples/widgets/icons/choicebk.xpm b/samples/widgets/icons/choicebk.xpm
index 8a80eaa1c6c9d17629a82ac76398157db50da876..62a68068e3a5f81054aac91c7e812aaab50fa1aa 100644 (file)
--- a/samples/widgets/icons/choicebk.xpm
+++ b/samples/widgets/icons/choicebk.xpm
@@ -25,11 +25,11 @@ static char *choicebk_xpm[] = {
 "################################",
 "################################",
 "##                            ##",
-"## ################           ##",
-"## ################   #####   ##",
-"## ################    ###    ##",
-"## ################     #     ##",
-"## ################           ##",
+"## ::::::::::::::::           ##",
+"## ::::::::::::::::   :::::   ##",
+"## ::::::::::::::::    :::    ##",
+"## ::::::::::::::::     :     ##",
+"## ::::::::::::::::           ##",
 "##                            ##",
 "################################",
 "######$$$$$$$$$$$$$$$$$$$$$$$$##",

diff --git a/samples/widgets/icons/combobox.xpm b/samples/widgets/icons/combobox.xpm
index 3e5598e4a54986c815c1800b0608964310a71b90..216561f567c9f9f9707cbf91c3e7e2014c82a7ec 100644 (file)
--- a/samples/widgets/icons/combobox.xpm
+++ b/samples/widgets/icons/combobox.xpm
@@ -22,33 +22,33 @@ static char *combobox_xpm[] = {
 "################################",
 "################################",
 "##                            ##",
-"## ################           ##",
-"## ################   #####   ##",
-"## ################    ###    ##",
-"## ################     #     ##",
-"## ################           ##",
+"## ::::::::::::::::           ##",
+"## ::::::::::::::::   :::::   ##",
+"## ::::::::::::::::    :::    ##",
+"## ::::::::::::::::     :     ##",
+"## ::::::::::::::::           ##",
 "##                            ##",
-"#### ############## ######### ##",
-"#### ############## ######### ##",
-"#### ############## #### #### ##",
-"#### ############## ###   ### ##",
-"#### ##       ##### ##     ## ##",
-"#### ############## ######### ##",
-"#### ##        #### ######### ##",
-"#### ############## ######### ##",
-"#### ##         ###           ##",
-"#### ############## ######### ##",
-"#### ##        #### ######### ##",
-"#### ############## ######### ##",
-"#### ##       ##### ##     ## ##",
-"#### ############## ###   ### ##",
-"#### ##        #### #### #### ##",
-"#### ############## ######### ##",
-"#### ############## ######### ##",
-"#### ############## ######### ##",
+"#### :::::::::::::: ::::::::: ##",
+"#### :::::::::::::: ::::::::: ##",
+"#### :::::::::::::: :::: :::: ##",
+"#### :::::::::::::: :::   ::: ##",
+"#### ::       ::::: ::     :: ##",
+"#### :::::::::::::: ::::::::: ##",
+"#### ::        :::: ::::::::: ##",
+"#### ::::::::::::::           ##",
+"#### ::         ::: ::::::::: ##",
+"#### :::::::::::::: ::::::::: ##",
+"#### ::        :::: ::::::::: ##",
+"#### ::::::::::::::           ##",
+"#### ::       ::::: ::::::::: ##",
+"#### :::::::::::::: ::::::::: ##",
+"#### ::        :::: ::     :: ##",
+"#### :::::::::::::: :::   ::: ##",
+"#### :::::::::::::: :::: :::: ##",
+"#### :::::::::::::: ::::::::: ##",
+"#### :::::::::::::: ::::::::: ##",
 "####                          ##",
 "################################",
 "################################",
-"################################",
 "################################"
 };

diff --git a/samples/widgets/icons/listbox.xpm b/samples/widgets/icons/listbox.xpm
index e124b93102643d92cb7eee747bfe9c3c212f38bc..80253d544741476c1adde28f687d01c49e177381 100644 (file)
--- a/samples/widgets/icons/listbox.xpm
+++ b/samples/widgets/icons/listbox.xpm
@@ -26,24 +26,24 @@ static char *listbox_xpm[] = {
 "################################",
 "################################",
 "###                          ###",
-"### ############## ######### ###",
-"### ############## ######### ###",
-"### ############## #### #### ###",
-"### ############## ###   ### ###",
-"### ##       ##### ##     ## ###",
-"### ############## ######### ###",
-"### ##        #### ######### ###",
-"### ############## ######### ###",
-"### ##         ###           ###",
-"### ############## ######### ###",
-"### ##        #### ######### ###",
-"### ############## ######### ###",
-"### ##       ##### ##     ## ###",
-"### ############## ###   ### ###",
-"### ##        #### #### #### ###",
-"### ############## ######### ###",
-"### ############## ######### ###",
-"### ############## ######### ###",
+"### :::::::::::::: ::::::::: ###",
+"### :::::::::::::: ::::::::: ###",
+"### ::     ::::::: :::: :::: ###",
+"### :::::::::::::: :::   ::: ###",
+"### ::       ::::: ::     :: ###",
+"### :::::::::::::: ::::::::: ###",
+"### ::        :::: ::::::::: ###",
+"### ::::::::::::::           ###",
+"### ::         ::: ::::::::: ###",
+"### :::::::::::::: ::::::::: ###",
+"### ::        ::::           ###",
+"### :::::::::::::: ::::::::: ###",
+"### ::       ::::: ::::::::: ###",
+"### :::::::::::::: ::     :: ###",
+"### ::        :::: :::   ::: ###",
+"### :::::::::::::: :::: :::: ###",
+"### ::     ::::::: ::::::::: ###",
+"### :::::::::::::: ::::::::: ###",
 "###                          ###",
 "################################",
 "################################",

diff --git a/samples/widgets/icons/odcombobox.xpm b/samples/widgets/icons/odcombobox.xpm
index 9f2316f45a81905e594a00a86eae806e3e118612..0be66bcc3a5d61e224e0035aae4700d68d6af7d7 100644 (file)
--- a/samples/widgets/icons/odcombobox.xpm
+++ b/samples/widgets/icons/odcombobox.xpm
@@ -28,27 +28,27 @@ static char *odcombobox_xpm[] = {
 "## :%%%%:&&&&:====:     :     ##",
 "## ::::::::::::::::           ##",
 "##                            ##",
-"#### :::::::::::::: ######### ##",
-"#### :            : ######### ##",
-"#### :: ::::::::::: #### #### ##",
-"#### :: : : : : ::: ###   ### ##",
-"#### :: ::::::::::: ##     ## ##",
-"#### ::   : : : ::: ######### ##",
-"#### :: : ::::::::: ######### ##",
-"#### :: : : : ::::: ######### ##",
-"#### :: : :::::::::           ##",
-"#### :: : : : : ::: ######### ##",
-"#### :: ::::::::::: ######### ##",
-"#### :: : : : : ::: ######### ##",
-"#### :: ::::::::::: ##     ## ##",
-"#### ::   : : ::::: ###   ### ##",
-"#### :::: ::::::::: #### #### ##",
-"#### :::: : : : ::: ######### ##",
-"#### :::::::::::::: ######### ##",
-"#### :::::::::::::: ######### ##",
+"#### :::::::::::::: ::::::::: ##",
+"#### :            : ::::::::: ##",
+"#### :: ::::::::::: :::: :::: ##",
+"#### :: : : : : ::: :::   ::: ##",
+"#### :: ::::::::::: ::     :: ##",
+"#### ::   : : : ::: ::::::::: ##",
+"#### :: : ::::::::: ::::::::: ##",
+"#### :: : : : :::::           ##",
+"#### :: : ::::::::: ::::::::: ##",
+"#### :: : : : : ::: ::::::::: ##",
+"#### :: ::::::::::: ::::::::: ##",
+"#### :: : : : : :::           ##",
+"#### :: ::::::::::: ::::::::: ##",
+"#### ::   : : ::::: ::::::::: ##",
+"#### :::: ::::::::: ::     :: ##",
+"#### :::: : : : ::: :::   ::: ##",
+"#### :::: ::::::::: :::: :::: ##",
+"#### :::: :: ::  :: ::::::::: ##",
+"#### :::::::::::::: ::::::::: ##",
 "####                          ##",
 "################################",
 "################################",
-"################################",
 "################################"
 };

diff --git a/samples/widgets/makefile.bcc b/samples/widgets/makefile.bcc
index bb563d0cd7c254ce98996df3acd81819939ffb56..e067977bc01e8f691aa79743b0bc7817a4989e7e 100644 (file)
--- a/samples/widgets/makefile.bcc
+++ b/samples/widgets/makefile.bcc
@@ -34,18 +34,19 @@ WIDGETS_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
        -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH \
        $(CPPFLAGS) $(CXXFLAGS)
 WIDGETS_OBJECTS =  \
+       $(OBJS)\widgets_bmpcombobox.obj \
        $(OBJS)\widgets_button.obj \
        $(OBJS)\widgets_checkbox.obj \
+       $(OBJS)\widgets_clrpicker.obj \
        $(OBJS)\widgets_combobox.obj \
        $(OBJS)\widgets_datepick.obj \
+       $(OBJS)\widgets_dirpicker.obj \
+       $(OBJS)\widgets_filepicker.obj \
+       $(OBJS)\widgets_fontpicker.obj \
        $(OBJS)\widgets_gauge.obj \
        $(OBJS)\widgets_hyperlnk.obj \
        $(OBJS)\widgets_listbox.obj \
        $(OBJS)\widgets_notebook.obj \
-       $(OBJS)\widgets_clrpicker.obj \
-       $(OBJS)\widgets_fontpicker.obj \
-       $(OBJS)\widgets_filepicker.obj \
-       $(OBJS)\widgets_dirpicker.obj \
        $(OBJS)\widgets_odcombobox.obj \
        $(OBJS)\widgets_radiobox.obj \
        $(OBJS)\widgets_slider.obj \
@@ -248,40 +249,43 @@ $(OBJS)\widgets.exe: $(WIDGETS_OBJECTS)  $(OBJS)\widgets_sample.res
        c0w32.obj $(WIDGETS_OBJECTS),$@,, $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_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) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\widgets_sample.res
 |
 
+$(OBJS)\widgets_bmpcombobox.obj: .\bmpcombobox.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+
 $(OBJS)\widgets_button.obj: .\button.cpp
        $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
 
 $(OBJS)\widgets_checkbox.obj: .\checkbox.cpp
        $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
 
-$(OBJS)\widgets_combobox.obj: .\combobox.cpp
+$(OBJS)\widgets_clrpicker.obj: .\clrpicker.cpp
        $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
 
-$(OBJS)\widgets_datepick.obj: .\datepick.cpp
+$(OBJS)\widgets_combobox.obj: .\combobox.cpp
        $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
 
-$(OBJS)\widgets_gauge.obj: .\gauge.cpp
+$(OBJS)\widgets_datepick.obj: .\datepick.cpp
        $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
 
-$(OBJS)\widgets_hyperlnk.obj: .\hyperlnk.cpp
+$(OBJS)\widgets_dirpicker.obj: .\dirpicker.cpp
        $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
 
-$(OBJS)\widgets_listbox.obj: .\listbox.cpp
+$(OBJS)\widgets_filepicker.obj: .\filepicker.cpp
        $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
 
-$(OBJS)\widgets_notebook.obj: .\notebook.cpp
+$(OBJS)\widgets_fontpicker.obj: .\fontpicker.cpp
        $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
 
-$(OBJS)\widgets_clrpicker.obj: .\clrpicker.cpp
+$(OBJS)\widgets_gauge.obj: .\gauge.cpp
        $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
 
-$(OBJS)\widgets_fontpicker.obj: .\fontpicker.cpp
+$(OBJS)\widgets_hyperlnk.obj: .\hyperlnk.cpp
        $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
 
-$(OBJS)\widgets_filepicker.obj: .\filepicker.cpp
+$(OBJS)\widgets_listbox.obj: .\listbox.cpp
        $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
 
-$(OBJS)\widgets_dirpicker.obj: .\dirpicker.cpp
+$(OBJS)\widgets_notebook.obj: .\notebook.cpp
        $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
 
 $(OBJS)\widgets_odcombobox.obj: .\odcombobox.cpp

diff --git a/samples/widgets/makefile.gcc b/samples/widgets/makefile.gcc
index 4af1dc11db268929072b00c308c16c3d6483b447..85f04769480c3a537ba800edeed3b287012e92f3 100644 (file)
--- a/samples/widgets/makefile.gcc
+++ b/samples/widgets/makefile.gcc
@@ -27,18 +27,19 @@ WIDGETS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
        -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \
        $(CPPFLAGS) $(CXXFLAGS)
 WIDGETS_OBJECTS =  \
+       $(OBJS)\widgets_bmpcombobox.o \
        $(OBJS)\widgets_button.o \
        $(OBJS)\widgets_checkbox.o \
+       $(OBJS)\widgets_clrpicker.o \
        $(OBJS)\widgets_combobox.o \
        $(OBJS)\widgets_datepick.o \
+       $(OBJS)\widgets_dirpicker.o \
+       $(OBJS)\widgets_filepicker.o \
+       $(OBJS)\widgets_fontpicker.o \
        $(OBJS)\widgets_gauge.o \
        $(OBJS)\widgets_hyperlnk.o \
        $(OBJS)\widgets_listbox.o \
        $(OBJS)\widgets_notebook.o \
-       $(OBJS)\widgets_clrpicker.o \
-       $(OBJS)\widgets_fontpicker.o \
-       $(OBJS)\widgets_filepicker.o \
-       $(OBJS)\widgets_dirpicker.o \
        $(OBJS)\widgets_odcombobox.o \
        $(OBJS)\widgets_radiobox.o \
        $(OBJS)\widgets_slider.o \
@@ -241,40 +242,43 @@ clean:
 $(OBJS)\widgets.exe: $(WIDGETS_OBJECTS) $(OBJS)\widgets_sample_rc.o
        $(CXX) -o $@ $(WIDGETS_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_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) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
 
+$(OBJS)\widgets_bmpcombobox.o: ./bmpcombobox.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\widgets_button.o: ./button.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\widgets_checkbox.o: ./checkbox.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\widgets_combobox.o: ./combobox.cpp
+$(OBJS)\widgets_clrpicker.o: ./clrpicker.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\widgets_datepick.o: ./datepick.cpp
+$(OBJS)\widgets_combobox.o: ./combobox.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\widgets_gauge.o: ./gauge.cpp
+$(OBJS)\widgets_datepick.o: ./datepick.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\widgets_hyperlnk.o: ./hyperlnk.cpp
+$(OBJS)\widgets_dirpicker.o: ./dirpicker.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\widgets_listbox.o: ./listbox.cpp
+$(OBJS)\widgets_filepicker.o: ./filepicker.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\widgets_notebook.o: ./notebook.cpp
+$(OBJS)\widgets_fontpicker.o: ./fontpicker.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\widgets_clrpicker.o: ./clrpicker.cpp
+$(OBJS)\widgets_gauge.o: ./gauge.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\widgets_fontpicker.o: ./fontpicker.cpp
+$(OBJS)\widgets_hyperlnk.o: ./hyperlnk.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\widgets_filepicker.o: ./filepicker.cpp
+$(OBJS)\widgets_listbox.o: ./listbox.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\widgets_dirpicker.o: ./dirpicker.cpp
+$(OBJS)\widgets_notebook.o: ./notebook.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\widgets_odcombobox.o: ./odcombobox.cpp

diff --git a/samples/widgets/makefile.vc b/samples/widgets/makefile.vc
index 91aa1b48249d83964ff6fdd41a45f7bae977b13f..fd41093135849d33b71eb227236767e8497f878c 100644 (file)
--- a/samples/widgets/makefile.vc
+++ b/samples/widgets/makefile.vc
@@ -27,18 +27,19 @@ WIDGETS_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
        /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \
        $(CXXFLAGS)
 WIDGETS_OBJECTS =  \
+       $(OBJS)\widgets_bmpcombobox.obj \
        $(OBJS)\widgets_button.obj \
        $(OBJS)\widgets_checkbox.obj \
+       $(OBJS)\widgets_clrpicker.obj \
        $(OBJS)\widgets_combobox.obj \
        $(OBJS)\widgets_datepick.obj \
+       $(OBJS)\widgets_dirpicker.obj \
+       $(OBJS)\widgets_filepicker.obj \
+       $(OBJS)\widgets_fontpicker.obj \
        $(OBJS)\widgets_gauge.obj \
        $(OBJS)\widgets_hyperlnk.obj \
        $(OBJS)\widgets_listbox.obj \
        $(OBJS)\widgets_notebook.obj \
-       $(OBJS)\widgets_clrpicker.obj \
-       $(OBJS)\widgets_fontpicker.obj \
-       $(OBJS)\widgets_filepicker.obj \
-       $(OBJS)\widgets_dirpicker.obj \
        $(OBJS)\widgets_odcombobox.obj \
        $(OBJS)\widgets_radiobox.obj \
        $(OBJS)\widgets_slider.obj \
@@ -323,40 +324,43 @@ $(OBJS)\widgets.exe: $(WIDGETS_OBJECTS) $(OBJS)\widgets_sample.res
        $(WIDGETS_OBJECTS)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_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) 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)\widgets_bmpcombobox.obj: .\bmpcombobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+
 $(OBJS)\widgets_button.obj: .\button.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 
 $(OBJS)\widgets_checkbox.obj: .\checkbox.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 
-$(OBJS)\widgets_combobox.obj: .\combobox.cpp
+$(OBJS)\widgets_clrpicker.obj: .\clrpicker.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 
-$(OBJS)\widgets_datepick.obj: .\datepick.cpp
+$(OBJS)\widgets_combobox.obj: .\combobox.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 
-$(OBJS)\widgets_gauge.obj: .\gauge.cpp
+$(OBJS)\widgets_datepick.obj: .\datepick.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 
-$(OBJS)\widgets_hyperlnk.obj: .\hyperlnk.cpp
+$(OBJS)\widgets_dirpicker.obj: .\dirpicker.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 
-$(OBJS)\widgets_listbox.obj: .\listbox.cpp
+$(OBJS)\widgets_filepicker.obj: .\filepicker.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 
-$(OBJS)\widgets_notebook.obj: .\notebook.cpp
+$(OBJS)\widgets_fontpicker.obj: .\fontpicker.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 
-$(OBJS)\widgets_clrpicker.obj: .\clrpicker.cpp
+$(OBJS)\widgets_gauge.obj: .\gauge.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 
-$(OBJS)\widgets_fontpicker.obj: .\fontpicker.cpp
+$(OBJS)\widgets_hyperlnk.obj: .\hyperlnk.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 
-$(OBJS)\widgets_filepicker.obj: .\filepicker.cpp
+$(OBJS)\widgets_listbox.obj: .\listbox.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 
-$(OBJS)\widgets_dirpicker.obj: .\dirpicker.cpp
+$(OBJS)\widgets_notebook.obj: .\notebook.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 
 $(OBJS)\widgets_odcombobox.obj: .\odcombobox.cpp

diff --git a/samples/widgets/makefile.wat b/samples/widgets/makefile.wat
index 26cbbd402c84d075856fcfb6afa458b87f502028..6f52b20ba2d744a193fa12250281966be78dc8af 100644 (file)
--- a/samples/widgets/makefile.wat
+++ b/samples/widgets/makefile.wat
@@ -229,18 +229,19 @@ WIDGETS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
        -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
        $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
 WIDGETS_OBJECTS =  &
+       $(OBJS)\widgets_bmpcombobox.obj &
        $(OBJS)\widgets_button.obj &
        $(OBJS)\widgets_checkbox.obj &
+       $(OBJS)\widgets_clrpicker.obj &
        $(OBJS)\widgets_combobox.obj &
        $(OBJS)\widgets_datepick.obj &
+       $(OBJS)\widgets_dirpicker.obj &
+       $(OBJS)\widgets_filepicker.obj &
+       $(OBJS)\widgets_fontpicker.obj &
        $(OBJS)\widgets_gauge.obj &
        $(OBJS)\widgets_hyperlnk.obj &
        $(OBJS)\widgets_listbox.obj &
        $(OBJS)\widgets_notebook.obj &
-       $(OBJS)\widgets_clrpicker.obj &
-       $(OBJS)\widgets_fontpicker.obj &
-       $(OBJS)\widgets_filepicker.obj &
-       $(OBJS)\widgets_dirpicker.obj &
        $(OBJS)\widgets_odcombobox.obj &
        $(OBJS)\widgets_radiobox.obj &
        $(OBJS)\widgets_slider.obj &
@@ -279,40 +280,43 @@ $(OBJS)\widgets.exe :  $(WIDGETS_OBJECTS) $(OBJS)\widgets_sample.res
        @for %i in () do @%append $(OBJS)\widgets.lbc option stack=%i
        wlink @$(OBJS)\widgets.lbc
 
+$(OBJS)\widgets_bmpcombobox.obj :  .AUTODEPEND .\bmpcombobox.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
 $(OBJS)\widgets_button.obj :  .AUTODEPEND .\button.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
 
 $(OBJS)\widgets_checkbox.obj :  .AUTODEPEND .\checkbox.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
 
-$(OBJS)\widgets_combobox.obj :  .AUTODEPEND .\combobox.cpp
+$(OBJS)\widgets_clrpicker.obj :  .AUTODEPEND .\clrpicker.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
 
-$(OBJS)\widgets_datepick.obj :  .AUTODEPEND .\datepick.cpp
+$(OBJS)\widgets_combobox.obj :  .AUTODEPEND .\combobox.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
 
-$(OBJS)\widgets_gauge.obj :  .AUTODEPEND .\gauge.cpp
+$(OBJS)\widgets_datepick.obj :  .AUTODEPEND .\datepick.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
 
-$(OBJS)\widgets_hyperlnk.obj :  .AUTODEPEND .\hyperlnk.cpp
+$(OBJS)\widgets_dirpicker.obj :  .AUTODEPEND .\dirpicker.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
 
-$(OBJS)\widgets_listbox.obj :  .AUTODEPEND .\listbox.cpp
+$(OBJS)\widgets_filepicker.obj :  .AUTODEPEND .\filepicker.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
 
-$(OBJS)\widgets_notebook.obj :  .AUTODEPEND .\notebook.cpp
+$(OBJS)\widgets_fontpicker.obj :  .AUTODEPEND .\fontpicker.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
 
-$(OBJS)\widgets_clrpicker.obj :  .AUTODEPEND .\clrpicker.cpp
+$(OBJS)\widgets_gauge.obj :  .AUTODEPEND .\gauge.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
 
-$(OBJS)\widgets_fontpicker.obj :  .AUTODEPEND .\fontpicker.cpp
+$(OBJS)\widgets_hyperlnk.obj :  .AUTODEPEND .\hyperlnk.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
 
-$(OBJS)\widgets_filepicker.obj :  .AUTODEPEND .\filepicker.cpp
+$(OBJS)\widgets_listbox.obj :  .AUTODEPEND .\listbox.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
 
-$(OBJS)\widgets_dirpicker.obj :  .AUTODEPEND .\dirpicker.cpp
+$(OBJS)\widgets_notebook.obj :  .AUTODEPEND .\notebook.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
 
 $(OBJS)\widgets_odcombobox.obj :  .AUTODEPEND .\odcombobox.cpp

diff --git a/samples/widgets/widgets.bkl b/samples/widgets/widgets.bkl
index 28dd7f8812c551f98fe1b706d2888fc3ac5d97bd..11fa94529403ed2ddaa523e9670c280c1f21fa7f 100644 (file)
--- a/samples/widgets/widgets.bkl
+++ b/samples/widgets/widgets.bkl
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->
 <makefile>
 
     <include file="../../build/bakefiles/common_samples.bkl"/>
@@ -8,16 +9,16 @@
             bmpcombobox.cpp
             button.cpp
             checkbox.cpp
+            clrpicker.cpp
             combobox.cpp
             datepick.cpp
+            dirpicker.cpp
+            filepicker.cpp
+            fontpicker.cpp
             gauge.cpp
             hyperlnk.cpp
             listbox.cpp
             notebook.cpp
-            clrpicker.cpp
-            fontpicker.cpp
-            filepicker.cpp
-            dirpicker.cpp
             odcombobox.cpp
             radiobox.cpp
             slider.cpp

diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index 4c16ebb83c76cd73b06227e98abf1b6ce1693d21..510cdbc6589f8a01aaf52bc97daeb95f5c02865d 100644 (file)
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -637,6 +637,8 @@ void WidgetsFrame::OnPageChanging(WidgetsBookCtrlEvent& event)
     // don't allow selection of entries without pages (categories)
     if ( !m_book->GetPage(event.GetSelection()) )
         event.Veto();
+#else
+    wxUnusedVar(event);
 #endif
 }
 

diff --git a/samples/widgets/widgets.dsp b/samples/widgets/widgets.dsp
index eace1ac4fab28938a0b539b4dc9d2eb10f77b1f7..9d39f95c8a88d9490374e8ea176cad52ed78ccee 100644 (file)
--- a/samples/widgets/widgets.dsp
+++ b/samples/widgets/widgets.dsp
@@ -468,6 +468,10 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=.\bmpcombobox.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\button.cpp
 # End Source File
 # Begin Source File