Added null checks to wxTextObjectData::GetDataHere and GetDataSize [ patch 1237326 ]

[wxWidgets.git] / src / common / stdpbase.cpp

diff --git a/src/common/stdpbase.cpp b/src/common/stdpbase.cpp
index ab6b882ef6b9b0f6f19ddab865c1683990033126..5c104c2fe929238982aa18854bc72d439e1c145d 100644 (file)
--- a/src/common/stdpbase.cpp
+++ b/src/common/stdpbase.cpp
@@ -24,6 +24,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_STDPATHS
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #endif //WX_PRECOMP
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #endif //WX_PRECOMP


@@ -73,7 +75,7 @@ wxString wxStandardPathsBase::AppendAppName(const wxString& dir)
 {
     wxString subdir(dir);
 
 {
     wxString subdir(dir);
 

-    // empty string indicates that an error has occured, don't touch it then
+    // empty string indicates that an error has occurred, don't touch it then

     if ( !subdir.empty() )
     {
         const wxString appname = wxTheApp->GetAppName();
     if ( !subdir.empty() )
     {
         const wxString appname = wxTheApp->GetAppName();


@@ -90,3 +92,4 @@ wxString wxStandardPathsBase::AppendAppName(const wxString& dir)
     return subdir;
 }
 
     return subdir;
 }
 

+#endif // wxUSE_STDPATHS