1. undid my wrong fix to wxWindowBase::Centre

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

diff --git a/src/common/config.cpp b/src/common/config.cpp
index cacf6c982c3de5e37988bf5566aebed9ff7772d2..19822e46912a335c1d6efe3e886a9e76118683b5 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -186,7 +186,7 @@ bool wxConfigBase::Read(const wxString& key, int *pi, int defVal) const
 bool wxConfigBase::Write(const wxString& key, double val)
 {
     wxString str;
 bool wxConfigBase::Write(const wxString& key, double val)
 {
     wxString str;

-    str.Printf(T("%f"), val);
+    str.Printf(wxT("%f"), val);

     return Write(key, str);
 }
 
     return Write(key, str);
 }
 


@@ -196,6 +196,11 @@ bool wxConfigBase::Write(const wxString& key, bool value)
     return Write(key, l);
 }
 
     return Write(key, l);
 }
 

+bool wxConfigBase::Write( const wxString &key, const wxChar *text )
+{
+       wxString str( text ) ;
+       return Write( key, str ) ;
+}

 wxString wxConfigBase::ExpandEnvVars(const wxString& str) const
 {
     wxString tmp; // Required for BC++
 wxString wxConfigBase::ExpandEnvVars(const wxString& str) const
 {
     wxString tmp; // Required for BC++


@@ -371,11 +376,11 @@ void wxSplitPath(wxArrayString& aParts, const wxChar *sz)
   wxString strCurrent;
   const wxChar *pc = sz;
   for ( ;; ) {
   wxString strCurrent;
   const wxChar *pc = sz;
   for ( ;; ) {

-    if ( *pc == T('\0') || *pc == wxCONFIG_PATH_SEPARATOR ) {
-      if ( strCurrent == T(".") ) {
+    if ( *pc == wxT('\0') || *pc == wxCONFIG_PATH_SEPARATOR ) {
+      if ( strCurrent == wxT(".") ) {

         // ignore
       }
         // ignore
       }

-      else if ( strCurrent == T("..") ) {
+      else if ( strCurrent == wxT("..") ) {

         // go up one level
         if ( aParts.IsEmpty() )
           wxLogWarning(_("'%s' has extra '..', ignored."), sz);
         // go up one level
         if ( aParts.IsEmpty() )
           wxLogWarning(_("'%s' has extra '..', ignored."), sz);


@@ -391,7 +396,7 @@ void wxSplitPath(wxArrayString& aParts, const wxChar *sz)
       //else:
         // could log an error here, but we prefer to ignore extra '/'
 
       //else:
         // could log an error here, but we prefer to ignore extra '/'
 

-      if ( *pc == T('\0') )
+      if ( *pc == wxT('\0') )

         return;
     }
     else
         return;
     }
     else