no changes, just remove #if'd out code

[wxWidgets.git] / include / wx / cmdargs.h

diff --git a/include/wx/cmdargs.h b/include/wx/cmdargs.h
index e3d74c031ab3558f1bb28cc2e0ae0719b28863bd..3f99cb50eb783363f404dade28fc834866535e6b 100644 (file)
--- a/include/wx/cmdargs.h
+++ b/include/wx/cmdargs.h
@@ -136,12 +136,12 @@ private:
     mutable char **m_argsA;
     mutable wchar_t **m_argsW;
 
     mutable char **m_argsA;
     mutable wchar_t **m_argsW;
 

-    DECLARE_NO_COPY_CLASS(wxCmdLineArgsArray)
+    wxDECLARE_NO_COPY_CLASS(wxCmdLineArgsArray);

 };
 
 // provide global operator overload for compatibility with the existing code
 // doing things like "if ( condition && argv )"
 };
 
 // provide global operator overload for compatibility with the existing code
 // doing things like "if ( condition && argv )"

-inline operator&&(bool cond, const wxCmdLineArgsArray& array)
+inline bool operator&&(bool cond, const wxCmdLineArgsArray& array)

 {
     return cond && !array.IsEmpty();
 }
 {
     return cond && !array.IsEmpty();
 }