Always rearrange wxListBook and send out size event, otherwise scrollbar overlaps...

[wxWidgets.git] / samples / widgets / makefile.vc

diff --git a/samples/widgets/makefile.vc b/samples/widgets/makefile.vc
index b35228a6dc8a991c781a69f4e7dc409ce4321017..fba66770eea1f2e27fd9c78f827ab79b90b8d413 100644 (file)
--- a/samples/widgets/makefile.vc
+++ b/samples/widgets/makefile.vc
@@ -1,10 +1,10 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

-!include <../../build/config.vc>
+!include <../../build/msw/config.vc>

 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!


@@ -12,8 +12,50 @@
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-WIDGETS_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\widgets.pdb $(__OPTIMIZEFLAG_3)  /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib  /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS)
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WIDGETS_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\widgets.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)
+WIDGETS_OBJECTS =  \
+       $(OBJS)\widgets_bmpcombobox.obj \
+       $(OBJS)\widgets_button.obj \
+       $(OBJS)\widgets_checkbox.obj \
+       $(OBJS)\widgets_choice.obj \
+       $(OBJS)\widgets_clrpicker.obj \
+       $(OBJS)\widgets_combobox.obj \
+       $(OBJS)\widgets_datepick.obj \
+       $(OBJS)\widgets_dirctrl.obj \
+       $(OBJS)\widgets_dirpicker.obj \
+       $(OBJS)\widgets_filectrl.obj \
+       $(OBJS)\widgets_filepicker.obj \
+       $(OBJS)\widgets_fontpicker.obj \
+       $(OBJS)\widgets_gauge.obj \
+       $(OBJS)\widgets_hyperlnk.obj \
+       $(OBJS)\widgets_itemcontainer.obj \
+       $(OBJS)\widgets_listbox.obj \
+       $(OBJS)\widgets_notebook.obj \
+       $(OBJS)\widgets_odcombobox.obj \
+       $(OBJS)\widgets_radiobox.obj \
+       $(OBJS)\widgets_searchctrl.obj \
+       $(OBJS)\widgets_slider.obj \
+       $(OBJS)\widgets_spinbtn.obj \
+       $(OBJS)\widgets_static.obj \
+       $(OBJS)\widgets_textctrl.obj \
+       $(OBJS)\widgets_toggle.obj \
+       $(OBJS)\widgets_widgets.obj \
+       $(OBJS)\widgets_sample.res

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 


@@ -23,11 +65,11 @@ PORTNAME = base
 !if "$(USE_GUI)" == "1"
 PORTNAME = msw
 !endif
 !if "$(USE_GUI)" == "1"
 PORTNAME = msw
 !endif

-!if "$(BUILD)" == "debug"
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"

 WXDEBUGFLAG = d
 !endif
 WXDEBUGFLAG = d
 !endif

-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
+!if "$(DEBUG_FLAG)" == "1"
+WXDEBUGFLAG = d

 !endif
 !if "$(UNICODE)" == "1"
 WXUNICODEFLAG = u
 !endif
 !if "$(UNICODE)" == "1"
 WXUNICODEFLAG = u


@@ -35,68 +77,245 @@ WXUNICODEFLAG = u
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif

-!if "$(BUILD)" == "debug"
-__DEBUGFLAG_0 = /Zi
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64

 !endif
 !endif

-!if "$(BUILD)" == "release"
-__DEBUGFLAG_0 = 
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64

 !endif
 !endif

-!if "$(BUILD)" == "debug"
-__DEBUGFLAG_1 = /DEBUG
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64

 !endif
 !endif

-!if "$(BUILD)" == "release"
-__DEBUGFLAG_1 = 
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64

 !endif
 !endif

-!if "$(BUILD)" == "debug"
-__DEBUGFLAG_2 = d
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll

 !endif
 !endif

-!if "$(BUILD)" == "release"
-__DEBUGFLAG_2 = 
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib

 !endif
 !endif

-!if "$(BUILD)" == "debug"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll

 !endif
 !endif

-!if "$(BUILD)" == "debug"
-__DEBUG_DEFINE_p_1 = /d__WXDEBUG__
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64

 !endif
 !endif

-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64

 !endif
 !endif

-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /dWXUSINGDLL
+!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"
 !endif
 !if "$(BUILD)" == "debug"

-__OPTIMIZEFLAG_3 = /Od
+__OPTIMIZEFLAG_4 = /Od

 !endif
 !if "$(BUILD)" == "release"
 !endif
 !if "$(BUILD)" == "release"

-__OPTIMIZEFLAG_3 = /O2
+__OPTIMIZEFLAG_4 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_7 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_7 = T

 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_6 = D
+__RUNTIME_LIBS_8 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_6 = 
+__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"
 !endif
 !if "$(UNICODE)" == "1"

-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = /D_UNICODE

 !endif
 !if "$(UNICODE)" == "1"
 !endif
 !if "$(UNICODE)" == "1"

-__UNICODE_DEFINE_p_1 = /dwxUSE_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"
 !endif
 !if "$(MONOLITHIC)" == "0"

-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+__WXLIB_XML_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib

 !endif
 !if "$(MONOLITHIC)" == "0"
 !endif
 !if "$(MONOLITHIC)" == "0"

-__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.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"
 !endif
 !if "$(MONOLITHIC)" == "1"

-__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib

 !endif
 !endif

-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

 !endif
 !endif

-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__
+!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
 
 
 !endif
 
 


@@ -108,24 +327,79 @@ $(OBJS):
 
 all: $(OBJS)\widgets.exe
 
 
 all: $(OBJS)\widgets.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)\widgets.exe del $(OBJS)\widgets.exe
+       -if exist $(OBJS)\widgets.ilk del $(OBJS)\widgets.ilk
+       -if exist $(OBJS)\widgets.pdb del $(OBJS)\widgets.pdb
+
+$(OBJS)\widgets.exe: $(WIDGETS_OBJECTS) $(OBJS)\widgets_sample.res
+       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+       $(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) $(__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)\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_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_choice.obj: .\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_clrpicker.obj: .\clrpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+

 $(OBJS)\widgets_combobox.obj: .\combobox.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 
 $(OBJS)\widgets_combobox.obj: .\combobox.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 

+$(OBJS)\widgets_datepick.obj: .\datepick.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_dirctrl.obj: .\dirctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_dirpicker.obj: .\dirpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_filectrl.obj: .\filectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_filepicker.obj: .\filepicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_fontpicker.obj: .\fontpicker.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+

 $(OBJS)\widgets_gauge.obj: .\gauge.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 
 $(OBJS)\widgets_gauge.obj: .\gauge.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 

+$(OBJS)\widgets_hyperlnk.obj: .\hyperlnk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+
+$(OBJS)\widgets_itemcontainer.obj: .\itemcontainer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+

 $(OBJS)\widgets_listbox.obj: .\listbox.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 
 $(OBJS)\widgets_notebook.obj: .\notebook.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 
 $(OBJS)\widgets_listbox.obj: .\listbox.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 
 $(OBJS)\widgets_notebook.obj: .\notebook.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 

+$(OBJS)\widgets_odcombobox.obj: .\odcombobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+

 $(OBJS)\widgets_radiobox.obj: .\radiobox.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 
 $(OBJS)\widgets_radiobox.obj: .\radiobox.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 

+$(OBJS)\widgets_searchctrl.obj: .\searchctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+

 $(OBJS)\widgets_slider.obj: .\slider.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 
 $(OBJS)\widgets_slider.obj: .\slider.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 


@@ -138,18 +412,12 @@ $(OBJS)\widgets_static.obj: .\static.cpp
 $(OBJS)\widgets_textctrl.obj: .\textctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 
 $(OBJS)\widgets_textctrl.obj: .\textctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 

-$(OBJS)\widgets_widgets.obj: .\widgets.cpp
+$(OBJS)\widgets_toggle.obj: .\toggle.cpp

        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 
        $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
 

-$(OBJS)\widgets_widgets.res: .\widgets.rc
-       rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib  /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $**
+$(OBJS)\widgets_widgets.obj: .\widgets.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**

 
 

-clean: 
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res
-       -if exist $(OBJS)\widgets.exe del $(OBJS)\widgets.exe
+$(OBJS)\widgets_sample.res: .\..\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)\widgets.exe: $(OBJS)\widgets_button.obj $(OBJS)\widgets_combobox.obj $(OBJS)\widgets_gauge.obj $(OBJS)\widgets_listbox.obj $(OBJS)\widgets_notebook.obj $(OBJS)\widgets_radiobox.obj $(OBJS)\widgets_slider.obj $(OBJS)\widgets_spinbtn.obj $(OBJS)\widgets_static.obj $(OBJS)\widgets_textctrl.obj $(OBJS)\widgets_widgets.obj $(OBJS)\widgets_widgets.res
-       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1)  /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  /SUBSYSTEM:WINDOWS @<<
-       $(OBJS)\widgets_button.obj $(OBJS)\widgets_combobox.obj $(OBJS)\widgets_gauge.obj $(OBJS)\widgets_listbox.obj $(OBJS)\widgets_notebook.obj $(OBJS)\widgets_radiobox.obj $(OBJS)\widgets_slider.obj $(OBJS)\widgets_spinbtn.obj $(OBJS)\widgets_static.obj $(OBJS)\widgets_textctrl.obj $(OBJS)\widgets_widgets.obj $(OBJS)\widgets_widgets.res  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib
-<<