Added more flags to resource.cpp, #ifdefed out ScanfV for Windows, some

[wxWidgets.git] / src / generic / helpxlp.cpp

diff --git a/src/generic/helpxlp.cpp b/src/generic/helpxlp.cpp
index 0631f6d80a7e0946f8c6cb9b811c4d3d923c9d30..0487ac5cfda6bae107eb248a569a2d14cbb857b1 100644 (file)
--- a/src/generic/helpxlp.cpp
+++ b/src/generic/helpxlp.cpp
@@ -66,13 +66,22 @@ IMPLEMENT_CLASS(wxXLPHelpConnection, wxTCPConnection)
 IMPLEMENT_CLASS(wxXLPHelpController, wxHelpControllerBase)
 #endif
 
-wxXLPHelpController::wxXLPHelpController(void):
-  helpClient(this)
+// suppress annoying warning "'this' used in base member init list" (so what?)
+#ifdef _MSC_VER
+#pragma warning(disable: 4355)
+#endif // Visual C++
+
+wxXLPHelpController::wxXLPHelpController(void)
+                   : helpClient(this)
 {
   helpFile = ""; helpServer = -1; helpHost = "";
   helpRunning = FALSE; helpConnection = NULL;
 }
 
+#ifdef _MSC_VER
+#pragma warning(default: 4355)
+#endif // Visual C++
+
 wxXLPHelpController::~wxXLPHelpController(void)
 {
 }