Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/samples/grid/makefile.wat b/samples/grid/makefile.wat
index 8f565c5f02d3aeacf100994d1954a501db4bec28..25379dfdbd823ae6007aab81d70fc319a9c7fb31 100644 (file)
--- a/samples/grid/makefile.wat
+++ b/samples/grid/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================\r
 #     This makefile was generated by\r
-#     Bakefile 0.2.8 (http://www.bakefile.org)\r
+#     Bakefile 0.2.9 (http://www.bakefile.org)\r
 #     Do not modify, all changes will be overwritten!\r
 # =========================================================================\r
 \r
@@ -253,7 +253,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\grid.exe del $(OBJS)\grid.exe\r
 \r
-$(OBJS)\grid.exe :  $(GRID_OBJECTS) $(OBJS)\grid_griddemo.res\r
+$(OBJS)\grid.exe :  $(GRID_OBJECTS) $(OBJS)\grid_sample.res\r
        @%create $(OBJS)\grid.lbc\r
        @%append $(OBJS)\grid.lbc option quiet\r
        @%append $(OBJS)\grid.lbc name $^@\r
@@ -261,13 +261,13 @@ $(OBJS)\grid.exe :  $(GRID_OBJECTS) $(OBJS)\grid_griddemo.res
        @%append $(OBJS)\grid.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(GRID_OBJECTS)) do @%append $(OBJS)\grid.lbc file %i\r
        @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)  $(__CAIRO_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)\grid.lbc library %i\r
-       @%append $(OBJS)\grid.lbc option resource=$(OBJS)\grid_griddemo.res\r
+       @%append $(OBJS)\grid.lbc option resource=$(OBJS)\grid_sample.res\r
        @for %i in () do @%append $(OBJS)\grid.lbc option stack=%i\r
        wlink @$(OBJS)\grid.lbc\r
 \r
+$(OBJS)\grid_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
+\r
 $(OBJS)\grid_griddemo.obj :  .AUTODEPEND .\griddemo.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(GRID_CXXFLAGS) $<\r
 \r
-$(OBJS)\grid_griddemo.res :  .AUTODEPEND .\griddemo.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r