Fixed some warnings

[wxWidgets.git] / src / msw / registry.cpp

diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp
index ab1629ca2a9b8675b4d9064ac81073fea44344ae..144009b810b7cf2f9a08144b8faa65f3a745c1b8 100644 (file)
--- a/src/msw/registry.cpp
+++ b/src/msw/registry.cpp
@@ -33,10 +33,10 @@
 #include "wx/dynlib.h"
 #include "wx/file.h"
 #include "wx/wfstream.h"
 #include "wx/dynlib.h"
 #include "wx/file.h"
 #include "wx/wfstream.h"

+#include "wx/msw/private.h"

 
 // Windows headers
 #ifdef __WXWINCE__
 
 // Windows headers
 #ifdef __WXWINCE__

-#include "wx/msw/private.h"

 #include <winbase.h>
 #include <winreg.h>
 #endif
 #include <winbase.h>
 #include <winreg.h>
 #endif


@@ -326,7 +326,7 @@ void wxRegKey::SetHkey(WXHKEY hKey)
   m_mode = Write;
 
   // reset old data
   m_mode = Write;
 
   // reset old data

-  m_strKey.empty();
+  m_strKey.clear();

   m_dwLastError = 0;
 }
 
   m_dwLastError = 0;
 }
 


@@ -1057,7 +1057,7 @@ bool wxRegKey::SetValue(const wxString& szValue, const wxString& strValue)
       m_dwLastError = RegSetValueEx((HKEY) m_hKey,
                                     RegValueStr(szValue),
                                     (DWORD) RESERVED, REG_SZ,
       m_dwLastError = RegSetValueEx((HKEY) m_hKey,
                                     RegValueStr(szValue),
                                     (DWORD) RESERVED, REG_SZ,

-                                    (RegString)strValue.t_str(),
+                                    (RegString)wxMSW_CONV_LPCTSTR(strValue),

                                     (strValue.Len() + 1)*sizeof(wxChar));
       if ( m_dwLastError == ERROR_SUCCESS )
         return true;
                                     (strValue.Len() + 1)*sizeof(wxChar));
       if ( m_dwLastError == ERROR_SUCCESS )
         return true;


@@ -1235,7 +1235,7 @@ bool wxRegKey::Export(const wxString& filename) const
 
     wxFFileOutputStream ostr(filename, wxT("w"));
 
 
     wxFFileOutputStream ostr(filename, wxT("w"));
 

-    return ostr.Ok() && Export(ostr);
+    return ostr.IsOk() && Export(ostr);

 #else
     wxUnusedVar(filename);
     return false;
 #else
     wxUnusedVar(filename);
     return false;