Do not use Tooltips if they are disabled

[wxWidgets.git] / samples / propgrid / makefile.wat

diff --git a/samples/propgrid/makefile.wat b/samples/propgrid/makefile.wat
index 7da103778977f22d7301eaca9de56e82458b75a4..e66e0f73517218b9ad1706a7a17d6678b4a0544c 100644 (file)
--- a/samples/propgrid/makefile.wat
+++ b/samples/propgrid/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.2.5 (http://www.bakefile.org)
+#     Bakefile 0.2.6 (http://www.bakefile.org)

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


@@ -18,7 +18,11 @@
 !  loaddll wpp      wppdi86
 !  loaddll wppaxp   wppdaxp
 !  loaddll wpp386   wppd386
 !  loaddll wpp      wppdi86
 !  loaddll wppaxp   wppdaxp
 !  loaddll wpp386   wppd386

+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else

 !  loaddll wlink    wlink
 !  loaddll wlink    wlink

+! endif

 !  loaddll wlib     wlibd
 !endif
 
 !  loaddll wlib     wlibd
 !endif
 


@@ -266,7 +270,7 @@ $(OBJS)\propgrid.exe :  $(PROPGRID_OBJECTS) $(OBJS)\propgrid_sample.res
        @%append $(OBJS)\propgrid.lbc option caseexact
        @%append $(OBJS)\propgrid.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
        @for %i in ($(PROPGRID_OBJECTS)) do @%append $(OBJS)\propgrid.lbc file %i
        @%append $(OBJS)\propgrid.lbc option caseexact
        @%append $(OBJS)\propgrid.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
        @for %i in ($(PROPGRID_OBJECTS)) do @%append $(OBJS)\propgrid.lbc file %i

-       @for %i in ( $(__WXLIB_PROPGRID_p)  $(__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) do @%append $(OBJS)\propgrid.lbc library %i
+       @for %i in ( $(__WXLIB_PROPGRID_p)  $(__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 wininet.lib) do @%append $(OBJS)\propgrid.lbc library %i

        @%append $(OBJS)\propgrid.lbc option resource=$(OBJS)\propgrid_sample.res
        @for %i in () do @%append $(OBJS)\propgrid.lbc option stack=%i
        wlink @$(OBJS)\propgrid.lbc
        @%append $(OBJS)\propgrid.lbc option resource=$(OBJS)\propgrid_sample.res
        @for %i in () do @%append $(OBJS)\propgrid.lbc option stack=%i
        wlink @$(OBJS)\propgrid.lbc