Give wxScrolledWindow its own Layout method that takes into account

[wxWidgets.git] / src / os2 / iniconf.cpp

diff --git a/src/os2/iniconf.cpp b/src/os2/iniconf.cpp
index 3b49835c8a073b3f74b2dcb099c5daf2319d7090..05bdb58dd63475ea96a0affafb042b833abfb609 100644 (file)
--- a/src/os2/iniconf.cpp
+++ b/src/os2/iniconf.cpp
@@ -21,7 +21,9 @@
 
 #include  <wx/dynarray.h>
 #include  <wx/log.h>
 
 #include  <wx/dynarray.h>
 #include  <wx/log.h>

+

 #include  <wx/config.h>
 #include  <wx/config.h>

+#if wxUSE_CONFIG

 
 #include  <wx/os2/iniconf.h>
 
 
 #include  <wx/os2/iniconf.h>
 


@@ -63,7 +65,7 @@ wxIniConfig::wxIniConfig(const wxString& strAppName,
 
     // append the extension if none given and it's not an absolute file name
     // (otherwise we assume that they know what they're doing)
 
     // append the extension if none given and it's not an absolute file name
     // (otherwise we assume that they know what they're doing)

-    if ( !wxIsPathSeparator(m_strLocalFilename[0u]) &&
+    if ( !wxIsPathSeparator(m_strLocalFilename[(size_t) 0]) &&

         m_strLocalFilename.Find('.') == wxNOT_FOUND )
     {
         m_strLocalFilename << ".ini";
         m_strLocalFilename.Find('.') == wxNOT_FOUND )
     {
         m_strLocalFilename << ".ini";


@@ -88,7 +90,7 @@ void wxIniConfig::SetPath(const wxString& strPath)
   if ( strPath.IsEmpty() ) {
     // nothing
   }
   if ( strPath.IsEmpty() ) {
     // nothing
   }

-  else if ( strPath[0u] == wxCONFIG_PATH_SEPARATOR ) {
+  else if ( strPath[(size_t) 0] == wxCONFIG_PATH_SEPARATOR ) {

     // absolute path
     wxSplitPath(aParts, strPath);
   }
     // absolute path
     wxSplitPath(aParts, strPath);
   }


@@ -107,7 +109,7 @@ void wxIniConfig::SetPath(const wxString& strPath)
   }
   else {
     // translate
   }
   else {
     // translate

-    m_strGroup = aParts[0u];
+    m_strGroup = aParts[(size_t) 0];

     for ( size_t nPart = 1; nPart < nPartsCount; nPart++ ) {
       if ( nPart > 1 )
         m_strPath << PATH_SEP_REPLACE;
     for ( size_t nPart = 1; nPart < nPartsCount; nPart++ ) {
       if ( nPart > 1 )
         m_strPath << PATH_SEP_REPLACE;


@@ -461,3 +463,5 @@ bool wxIniConfig::RenameGroup(const wxString& oldName, const wxString& newName)
     // Not implemented
     return FALSE;
 }
     // Not implemented
     return FALSE;
 }

+
+#endif //wxUSE_CONFIG