Removed some superflous #defines already added by plaform.h, simplified a bit

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

diff --git a/src/msw/mimetype.cpp b/src/msw/mimetype.cpp
index c5d50392128f1f54584c63055cfdcfc9e449d0eb..a453c99079fd80138c9054de71807a9fb1bf9388 100644 (file)
--- a/src/msw/mimetype.cpp
+++ b/src/msw/mimetype.cpp
@@ -88,7 +88,7 @@ void wxFileTypeImpl::Init(const wxString& strFileType, const wxString& ext)
 
     m_strFileType = strFileType;
     if ( !strFileType ) {
 
     m_strFileType = strFileType;
     if ( !strFileType ) {

-        m_strFileType = m_ext.AfterFirst('.') + "_auto_file";
+        m_strFileType = m_ext.AfterFirst('.') + _T("_auto_file");

     }
 }
 
     }
 }
 


@@ -237,6 +237,9 @@ wxString wxFileTypeImpl::GetCommand(const wxChar *verb) const
                 wxRegKey(wxRegKey::HKCR, strKey + _T("\\Topic")).
                     QueryValue(_T(""), ddeTopic);
 
                 wxRegKey(wxRegKey::HKCR, strKey + _T("\\Topic")).
                     QueryValue(_T(""), ddeTopic);
 

+                if (ddeTopic.IsEmpty())
+                    ddeTopic = wxT("System");
+

                 // HACK: we use a special feature of wxExecute which exists
                 //       just because we need it here: it will establish DDE
                 //       conversation with the program it just launched
                 // HACK: we use a special feature of wxExecute which exists
                 //       just because we need it here: it will establish DDE
                 //       conversation with the program it just launched