forward WM_HELP from the buddy control to the main one in order to make context sensi...

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

diff --git a/src/msw/mimetype.cpp b/src/msw/mimetype.cpp
index 7ff39b642738c12b6de8f70015575f4ef2c2e286..0649f09ed732b39a8c6dfc3089bb5c4076ad9597 100644 (file)
--- a/src/msw/mimetype.cpp
+++ b/src/msw/mimetype.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/mimetype.cpp
+// Name:        src/msw/mimetype.cpp

 // Purpose:     classes and functions to manage MIME types
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     classes and functions to manage MIME types
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -9,32 +9,31 @@
 // Licence:     wxWindows licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "mimetype.h"
-#endif
-

 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_MIMETYPE
 
 #endif
 
 #if wxUSE_MIMETYPE
 

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

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/dynarray.h"

     #include "wx/string.h"
     #include "wx/string.h"

+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/crt.h"

     #if wxUSE_GUI
         #include "wx/icon.h"
         #include "wx/msgdlg.h"
     #endif
 #endif //WX_PRECOMP
 
     #if wxUSE_GUI
         #include "wx/icon.h"
         #include "wx/msgdlg.h"
     #endif
 #endif //WX_PRECOMP
 

-#include "wx/log.h"

 #include "wx/file.h"
 #include "wx/iconloc.h"
 #include "wx/file.h"
 #include "wx/iconloc.h"

-#include "wx/intl.h"
-#include "wx/dynarray.h"

 #include "wx/confbase.h"
 
 #ifdef __WXMSW__
 #include "wx/confbase.h"
 
 #ifdef __WXMSW__


@@ -42,13 +41,11 @@
     #include "wx/msw/private.h"
 #endif // OS
 
     #include "wx/msw/private.h"
 #endif // OS
 

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

 // other standard headers
 #include <ctype.h>
 
 // in case we're compiling in non-GUI mode
 // other standard headers
 #include <ctype.h>
 
 // in case we're compiling in non-GUI mode

-class WXDLLEXPORT wxIcon;
+class WXDLLIMPEXP_FWD_CORE wxIcon;

 
 // These classes use Windows registry to retrieve the required information.
 //
 
 // These classes use Windows registry to retrieve the required information.
 //


@@ -203,7 +200,7 @@ bool wxFileTypeImpl::EnsureExtKeyExists()
 // get the command to use
 // ----------------------------------------------------------------------------
 
 // get the command to use
 // ----------------------------------------------------------------------------
 

-wxString wxFileTypeImpl::GetCommand(const wxChar *verb) const
+wxString wxFileTypeImpl::GetCommand(const wxString& verb) const

 {
     // suppress possible error messages
     wxLogNull nolog;
 {
     // suppress possible error messages
     wxLogNull nolog;


@@ -513,7 +510,7 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
                  _T("Associate() needs extension") );
 
     bool ok;
                  _T("Associate() needs extension") );
 
     bool ok;

-    int iExtCount = 0 ;
+    size_t iExtCount = 0;

     wxString filetype;
     wxString extWithDot;
 
     wxString filetype;
     wxString extWithDot;
 


@@ -551,56 +548,57 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
 
             key.SetValue(wxEmptyString, filetype);
         }
 
             key.SetValue(wxEmptyString, filetype);
         }

+    }
+    else
+    {
+        // key already exists, maybe we want to change it ??
+        if (!filetypeOrig.empty())
+        {
+            filetype = filetypeOrig;
+            key.SetValue(wxEmptyString, filetype);

         }
         else
         {
         }
         else
         {

-            // key already exists, maybe we want to change it ??
-            if (!filetypeOrig.empty())
-                {
-                    filetype = filetypeOrig;
-                    key.SetValue(wxEmptyString, filetype);
-                }
-            else
-                {
-                    key.QueryValue(wxEmptyString, filetype);
-                }
+            key.QueryValue(wxEmptyString, filetype);

         }
         }

-        // now set a mimetypeif we have it, but ignore it if none
-        const wxString& mimetype = ftInfo.GetMimeType();
-        if ( !mimetype.empty() )
+    }
+
+    // now set a mimetypeif we have it, but ignore it if none
+    const wxString& mimetype = ftInfo.GetMimeType();
+    if ( !mimetype.empty() )
+    {
+        // set the MIME type
+        ok = key.SetValue(_T("Content Type"), mimetype);
+
+        if ( ok )

         {
         {

-            // set the MIME type
-            ok = key.SetValue(_T("Content Type"), mimetype);
+            // create the MIME key
+            wxString strKey = MIME_DATABASE_KEY;
+            strKey << mimetype;
+            wxRegKey keyMIME(wxRegKey::HKCR, strKey);
+            ok = keyMIME.Create();

 
             if ( ok )
             {
 
             if ( ok )
             {

-                // create the MIME key
-                wxString strKey = MIME_DATABASE_KEY;
-                strKey << mimetype;
-                wxRegKey keyMIME(wxRegKey::HKCR, strKey);
-                ok = keyMIME.Create();
-
-                if ( ok )
-                {
-                    // and provide a back link to the extension
-                    keyMIME.SetValue(_T("Extension"), extWithDot);
-                }
+                // and provide a back link to the extension
+                keyMIME.SetValue(_T("Extension"), extWithDot);

             }
         }
             }
         }

+    }

 
 
     // now make other extensions have the same filetype
 
     for (iExtCount=1; iExtCount < ftInfo.GetExtensionsCount(); iExtCount++ )
 
 
     // now make other extensions have the same filetype
 
     for (iExtCount=1; iExtCount < ftInfo.GetExtensionsCount(); iExtCount++ )

-        {
-            ext = ftInfo.GetExtensions()[iExtCount];
-            if ( ext[0u] != _T('.') )
-               extWithDot = _T('.');
-            extWithDot += ext;
+    {
+        ext = ftInfo.GetExtensions()[iExtCount];
+        if ( ext[0u] != _T('.') )
+           extWithDot = _T('.');
+        extWithDot += ext;

 
 

-            wxRegKey key(wxRegKey::HKCR, extWithDot);
-            if ( !key.Exists() ) key.Create();
-            key.SetValue(wxEmptyString, filetype);
+        wxRegKey key(wxRegKey::HKCR, extWithDot);
+        if ( !key.Exists() ) key.Create();
+        key.SetValue(wxEmptyString, filetype);

 
         // now set any mimetypes we may have, but ignore it if none
         const wxString& mimetype = ftInfo.GetMimeType();
 
         // now set any mimetypes we may have, but ignore it if none
         const wxString& mimetype = ftInfo.GetMimeType();


@@ -609,22 +607,21 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
             // set the MIME type
             ok = key.SetValue(_T("Content Type"), mimetype);
 
             // set the MIME type
             ok = key.SetValue(_T("Content Type"), mimetype);
 

-        if ( ok )
-        {
+            if ( ok )
+            {

                 // create the MIME key
                 wxString strKey = MIME_DATABASE_KEY;
                 strKey << mimetype;
                 wxRegKey keyMIME(wxRegKey::HKCR, strKey);
                 ok = keyMIME.Create();
 
                 // create the MIME key
                 wxString strKey = MIME_DATABASE_KEY;
                 strKey << mimetype;
                 wxRegKey keyMIME(wxRegKey::HKCR, strKey);
                 ok = keyMIME.Create();
 

-        if ( ok )
-        {
+                if ( ok )
+                {

                     // and provide a back link to the extension
                     keyMIME.SetValue(_T("Extension"), extWithDot);
                     // and provide a back link to the extension
                     keyMIME.SetValue(_T("Extension"), extWithDot);

+                }
+            }

         }
         }

-        }
-    }
-

 
     } // end of for loop; all extensions now point to HKCR\.ext\Default
 
 
     } // end of for loop; all extensions now point to HKCR\.ext\Default
 


@@ -637,13 +634,14 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
 
     if (ft)
     {
 
     if (ft)
     {

-            if (! ftInfo.GetOpenCommand ().empty() ) ft->SetCommand (ftInfo.GetOpenCommand (), wxT("open"  ) );
-            if (! ftInfo.GetPrintCommand().empty() ) ft->SetCommand (ftInfo.GetPrintCommand(), wxT("print" ) );
-            // chris: I don't like the ->m_impl-> here FIX this ??
-            if (! ftInfo.GetDescription ().empty() ) ft->m_impl->SetDescription (ftInfo.GetDescription ()) ;
-            if (! ftInfo.GetIconFile().empty() ) ft->SetDefaultIcon (ftInfo.GetIconFile(), ftInfo.GetIconIndex() );
+        if (! ftInfo.GetOpenCommand ().empty() ) ft->SetCommand (ftInfo.GetOpenCommand (), wxT("open"  ) );
+        if (! ftInfo.GetPrintCommand().empty() ) ft->SetCommand (ftInfo.GetPrintCommand(), wxT("print" ) );
+        // chris: I don't like the ->m_impl-> here FIX this ??
+        if (! ftInfo.GetDescription ().empty() ) ft->m_impl->SetDescription (ftInfo.GetDescription ()) ;
+        if (! ftInfo.GetIconFile().empty() ) ft->SetDefaultIcon (ftInfo.GetIconFile(), ftInfo.GetIconIndex() );
+
+    }

 
 

-        }

     return ft;
 }
 
     return ft;
 }
 


@@ -761,7 +759,7 @@ bool wxFileTypeImpl::Unassociate()
         result = false;
     if ( !RemoveMimeType() )
         result = false;
         result = false;
     if ( !RemoveMimeType() )
         result = false;

-   if ( !RemoveDescription() )
+    if ( !RemoveDescription() )

         result = false;
 
 /*
         result = false;
 
 /*