Added an #ifdef

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

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index a4fde2951be0fe31ed0ebfe2c99ba7201f05de2a..daf445cefb88bee7d897a04c91b5bd02e880b6b6 100644 (file)
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -312,6 +312,7 @@ void MyFrame::DirChoose(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::ShowTip(wxCommandEvent& event)
 {
+#if wxUSE_STARTUP_TIPS
     static size_t s_index = (size_t)-1;
 
     if ( s_index == (size_t)-1 )
@@ -335,6 +336,7 @@ void MyFrame::ShowTip(wxCommandEvent& event)
 
     s_index = tipProvider->GetCurrentTip();
     delete tipProvider;
+#endif
 }
 
 void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event) )

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 226b187b75c5df1c4a4202a2cf2fee7ff1a6be6d..337520e00f88098c1304afa71b051ee7bef754ec 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -80,6 +80,7 @@ GENERICOBJS= \
   ..\generic\$D\statusbr.obj \
   ..\generic\$D\tabg.obj \
   ..\generic\$D\textdlgg.obj \
+  ..\generic\$D\extdlgg.obj \
   ..\generic\$D\tipdlg.obj
 
 #  ..\generic\$D\imaglist.obj \