Fixes to allow compilation with wxUSE_STD_STRING

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

utils/HelpGen/src/srcparser.cpp

@@ -533,7 +533,7 @@ spFile* SourceParserBase::ParseFile( const char* fname )
 
     FILE* fp = fopen( fname, "rt" );
 
-    if ( (int)fp == -1 || !fp ) return NULL;
+    if ( !fp ) return NULL;
 
     int sz = fread( mpFileBuf, 1, mFileBufSz, fp );
 
@@ -587,7 +587,7 @@ void spAttribute::DumpThis(const wxString& indent) const
 void spOperation::DumpThis(const wxString& indent) const
 {
     wxString protection;
-    if ( !!mScope ) {
+    if ( !mScope.empty() ) {
         switch ( mVisibility ) {
             case SP_VIS_PUBLIC:
                 protection = "public";