Fixed a long-standing issue where wxSlider controls with a hardcoded size would mispl...

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

diff --git a/src/msw/mimetype.cpp b/src/msw/mimetype.cpp
index 711023e8132971bf7b1c64c5b92124203cf8aacb..71334a8134b29228236eab497ecc4ac06244cb3b 100644 (file)
--- a/src/msw/mimetype.cpp
+++ b/src/msw/mimetype.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef    __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "mimetype.h"
 #endif
 
 #pragma implementation "mimetype.h"
 #endif
 


@@ -104,7 +104,7 @@ static bool CanonicalizeParams(wxString& command)
 void wxFileTypeImpl::Init(const wxString& strFileType, const wxString& ext)
 {
     // VZ: does it? (FIXME)
 void wxFileTypeImpl::Init(const wxString& strFileType, const wxString& ext)
 {
     // VZ: does it? (FIXME)

-    wxCHECK_RET( !ext.IsEmpty(), _T("needs an extension") );
+    wxCHECK_RET( !ext.empty(), _T("needs an extension") );

 
     if ( ext[0u] != wxT('.') ) {
         m_ext = wxT('.');
 
     if ( ext[0u] != wxT('.') ) {
         m_ext = wxT('.');


@@ -128,9 +128,9 @@ size_t wxFileTypeImpl::GetAllCommands(wxArrayString *verbs,
                                       wxArrayString *commands,
                                       const wxFileType::MessageParameters& params) const
 {
                                       wxArrayString *commands,
                                       const wxFileType::MessageParameters& params) const
 {

-    wxCHECK_MSG( !m_ext.IsEmpty(), 0, _T("GetAllCommands() needs an extension") );
+    wxCHECK_MSG( !m_ext.empty(), 0, _T("GetAllCommands() needs an extension") );

 
 

-    if ( m_strFileType.IsEmpty() )
+    if ( m_strFileType.empty() )

     {
         // get it from the registry
         wxFileTypeImpl *self = wxConstCast(this, wxFileTypeImpl);
     {
         // get it from the registry
         wxFileTypeImpl *self = wxConstCast(this, wxFileTypeImpl);


@@ -192,11 +192,11 @@ bool wxFileTypeImpl::EnsureExtKeyExists()
         {
             wxLogError(_("Failed to create registry entry for '%s' files."),
                        m_ext.c_str());
         {
             wxLogError(_("Failed to create registry entry for '%s' files."),
                        m_ext.c_str());

-            return FALSE;
+            return false;

         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -238,12 +238,12 @@ wxString wxFileTypeImpl::GetCommand(const wxChar *verb) const
                 keyDDE.QueryValue(wxEmptyString, ddeCommand);
                 ddeCommand.Replace(_T("%1"), _T("%s"));
 
                 keyDDE.QueryValue(wxEmptyString, ddeCommand);
                 ddeCommand.Replace(_T("%1"), _T("%s"));
 

-                wxRegKey(wxRegKey::HKCR, strKey + _T("\\Application")).
-                    QueryValue(wxEmptyString, ddeServer);
-                wxRegKey(wxRegKey::HKCR, strKey + _T("\\Topic")).
-                    QueryValue(wxEmptyString, ddeTopic);
+                wxRegKey keyServer(wxRegKey::HKCR, strKey + _T("\\Application"));
+                keyServer.QueryValue(wxEmptyString, ddeServer);
+                wxRegKey keyTopic(wxRegKey::HKCR, strKey + _T("\\Topic"));
+                keyTopic.QueryValue(wxEmptyString, ddeTopic);

 
 

-                if (ddeTopic.IsEmpty())
+                if (ddeTopic.empty())

                     ddeTopic = wxT("System");
 
                 // HACK: we use a special feature of wxExecute which exists
                     ddeTopic = wxT("System");
 
                 // HACK: we use a special feature of wxExecute which exists


@@ -281,7 +281,7 @@ wxFileTypeImpl::GetOpenCommand(wxString *openCmd,
 
     *openCmd = wxFileType::ExpandCommand(cmd, params);
 
 
     *openCmd = wxFileType::ExpandCommand(cmd, params);
 

-    return !openCmd->IsEmpty();
+    return !openCmd->empty();

 }
 
 bool
 }
 
 bool


@@ -293,7 +293,7 @@ wxFileTypeImpl::GetPrintCommand(wxString *printCmd,
 
     *printCmd = wxFileType::ExpandCommand(cmd, params);
 
 
     *printCmd = wxFileType::ExpandCommand(cmd, params);
 

-    return !printCmd->IsEmpty();
+    return !printCmd->empty();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -303,17 +303,17 @@ wxFileTypeImpl::GetPrintCommand(wxString *printCmd,
 // TODO this function is half implemented
 bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions)
 {
 // TODO this function is half implemented
 bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions)
 {

-    if ( m_ext.IsEmpty() ) {
+    if ( m_ext.empty() ) {

         // the only way to get the list of extensions from the file type is to
         // scan through all extensions in the registry - too slow...
         // the only way to get the list of extensions from the file type is to
         // scan through all extensions in the registry - too slow...

-        return FALSE;
+        return false;

     }
     else {
         extensions.Empty();
         extensions.Add(m_ext);
 
         // it's a lie too, we don't return _all_ extensions...
     }
     else {
         extensions.Empty();
         extensions.Add(m_ext);
 
         // it's a lie too, we don't return _all_ extensions...

-        return TRUE;
+        return true;

     }
 }
 
     }
 }
 


@@ -333,12 +333,12 @@ bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const
 
     if ( !GetMimeType(&s) )
     {
 
     if ( !GetMimeType(&s) )
     {

-        return FALSE;
+        return false;

     }
 
     mimeTypes.Clear();
     mimeTypes.Add(s);
     }
 
     mimeTypes.Clear();
     mimeTypes.Add(s);

-    return TRUE;
+    return true;

 }
 
 
 }
 
 


@@ -363,7 +363,7 @@ bool wxFileTypeImpl::GetIcon(wxIconLocation *iconLoc) const
 
             // index may be omitted, in which case BeforeLast(',') is empty and
             // AfterLast(',') is the whole string
 
             // index may be omitted, in which case BeforeLast(',') is empty and
             // AfterLast(',') is the whole string

-            if ( strFullPath.IsEmpty() ) {
+            if ( strFullPath.empty() ) {

                 strFullPath = strIndex;
                 strIndex = wxT("0");
             }
                 strFullPath = strIndex;
                 strIndex = wxT("0");
             }


@@ -375,12 +375,12 @@ bool wxFileTypeImpl::GetIcon(wxIconLocation *iconLoc) const
                 iconLoc->SetIndex(wxAtoi(strIndex));
             }
 
                 iconLoc->SetIndex(wxAtoi(strIndex));
             }
 

-            return TRUE;
+            return true;

         }
     }
 
     // no such file type or no value or incorrect icon entry
         }
     }
 
     // no such file type or no value or incorrect icon entry

-    return FALSE;
+    return false;

 }
 
 bool wxFileTypeImpl::GetDescription(wxString *desc) const
 }
 
 bool wxFileTypeImpl::GetDescription(wxString *desc) const


@@ -392,11 +392,11 @@ bool wxFileTypeImpl::GetDescription(wxString *desc) const
     if ( key.Open(wxRegKey::Read) ) {
         // it's the default value of the key
         if ( key.QueryValue(wxEmptyString, *desc) ) {
     if ( key.Open(wxRegKey::Read) ) {
         // it's the default value of the key
         if ( key.QueryValue(wxEmptyString, *desc) ) {

-            return TRUE;
+            return true;

         }
     }
 
         }
     }
 

-    return FALSE;
+    return false;

 }
 
 // helper function
 }
 
 // helper function


@@ -422,7 +422,7 @@ wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ext)
     // suppress possible error messages
     wxLogNull nolog;
 
     // suppress possible error messages
     wxLogNull nolog;
 

-    bool knownExtension = FALSE;
+    bool knownExtension = false;

 
     wxString strFileType;
     wxRegKey key(wxRegKey::HKCR, str);
 
     wxString strFileType;
     wxRegKey key(wxRegKey::HKCR, str);


@@ -436,7 +436,7 @@ wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ext)
             // this extension doesn't have a filetype, but it's known to the
             // system and may be has some other useful keys (open command or
             // content-type), so still return a file type object for it
             // this extension doesn't have a filetype, but it's known to the
             // system and may be has some other useful keys (open command or
             // content-type), so still return a file type object for it

-            knownExtension = TRUE;
+            knownExtension = true;

         }
     }
 
         }
     }
 


@@ -509,7 +509,7 @@ size_t wxMimeTypesManagerImpl::EnumAllFileTypes(wxArrayString& mimetypes)
 
 wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
 {
 
 wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
 {

-    wxCHECK_MSG( !ftInfo.GetExtensions().IsEmpty(), NULL,
+    wxCHECK_MSG( !ftInfo.GetExtensions().empty(), NULL,

                  _T("Associate() needs extension") );
 
     bool ok;
                  _T("Associate() needs extension") );
 
     bool ok;


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

-            if (! ftInfo.GetOpenCommand ().IsEmpty() ) ft->SetCommand (ftInfo.GetOpenCommand (), wxT("open"  ) );
-            if (! ftInfo.GetPrintCommand().IsEmpty() ) ft->SetCommand (ftInfo.GetPrintCommand(), wxT("print" ) );
+            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 ??
             // chris: I don't like the ->m_impl-> here FIX this ??

-            if (! ftInfo.GetDescription ().IsEmpty() ) ft->m_impl->SetDescription (ftInfo.GetDescription ()) ;
-            if (! ftInfo.GetIconFile().IsEmpty() ) ft->SetDefaultIcon (ftInfo.GetIconFile(), ftInfo.GetIconIndex() );
+            if (! ftInfo.GetDescription ().empty() ) ft->m_impl->SetDescription (ftInfo.GetDescription ()) ;
+            if (! ftInfo.GetIconFile().empty() ) ft->SetDefaultIcon (ftInfo.GetIconFile(), ftInfo.GetIconIndex() );

 
         }
     return ft;
 
         }
     return ft;


@@ -651,11 +651,11 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd,
                                 const wxString& verb,
                                 bool WXUNUSED(overwriteprompt))
 {
                                 const wxString& verb,
                                 bool WXUNUSED(overwriteprompt))
 {

-    wxCHECK_MSG( !m_ext.IsEmpty() && !verb.IsEmpty(), FALSE,
+    wxCHECK_MSG( !m_ext.empty() && !verb.empty(), false,

                  _T("SetCommand() needs an extension and a verb") );
 
     if ( !EnsureExtKeyExists() )
                  _T("SetCommand() needs an extension and a verb") );
 
     if ( !EnsureExtKeyExists() )

-        return FALSE;
+        return false;

 
     wxRegKey rkey(wxRegKey::HKCR, GetVerbPath(verb));
 #if 0
 
     wxRegKey rkey(wxRegKey::HKCR, GetVerbPath(verb));
 #if 0


@@ -680,7 +680,7 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd,
 #endif // wxUSE_GUI
         {
             // cancelled by user
 #endif // wxUSE_GUI
         {
             // cancelled by user

-            return FALSE;
+            return false;

         }
     }
 #endif
         }
     }
 #endif


@@ -693,10 +693,10 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd,
 /* // no longer used
 bool wxFileTypeImpl::SetMimeType(const wxString& mimeTypeOrig)
 {
 /* // no longer used
 bool wxFileTypeImpl::SetMimeType(const wxString& mimeTypeOrig)
 {

-    wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, _T("SetMimeType() needs extension") );
+    wxCHECK_MSG( !m_ext.empty(), false, _T("SetMimeType() needs extension") );

 
     if ( !EnsureExtKeyExists() )
 
     if ( !EnsureExtKeyExists() )

-        return FALSE;
+        return false;

 
     // VZ: is this really useful? (FIXME)
     wxString mimeType;
 
     // VZ: is this really useful? (FIXME)
     wxString mimeType;


@@ -719,13 +719,13 @@ bool wxFileTypeImpl::SetMimeType(const wxString& mimeTypeOrig)
 
 bool wxFileTypeImpl::SetDefaultIcon(const wxString& cmd, int index)
 {
 
 bool wxFileTypeImpl::SetDefaultIcon(const wxString& cmd, int index)
 {

-    wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, _T("SetDefaultIcon() needs extension") );
-    wxCHECK_MSG( !m_strFileType.IsEmpty(), FALSE, _T("File key not found") );
+    wxCHECK_MSG( !m_ext.empty(), false, _T("SetDefaultIcon() needs extension") );
+    wxCHECK_MSG( !m_strFileType.empty(), false, _T("File key not found") );

 //    the next line fails on a SMBshare, I think because it is case mangled
 //    the next line fails on a SMBshare, I think because it is case mangled

-//    wxCHECK_MSG( !wxFileExists(cmd), FALSE, _T("Icon file not found.") );
+//    wxCHECK_MSG( !wxFileExists(cmd), false, _T("Icon file not found.") );

 
     if ( !EnsureExtKeyExists() )
 
     if ( !EnsureExtKeyExists() )

-        return FALSE;
+        return false;

 
     wxRegKey rkey(wxRegKey::HKCR, m_strFileType + _T("\\DefaultIcon"));
 
 
     wxRegKey rkey(wxRegKey::HKCR, m_strFileType + _T("\\DefaultIcon"));
 


@@ -736,11 +736,11 @@ bool wxFileTypeImpl::SetDefaultIcon(const wxString& cmd, int index)
 
 bool wxFileTypeImpl::SetDescription (const wxString& desc)
 {
 
 bool wxFileTypeImpl::SetDescription (const wxString& desc)
 {

-    wxCHECK_MSG( !m_strFileType.IsEmpty(), FALSE, _T("File key not found") );
-    wxCHECK_MSG( !desc.IsEmpty(), FALSE, _T("No file description supplied") );
+    wxCHECK_MSG( !m_strFileType.empty(), false, _T("File key not found") );
+    wxCHECK_MSG( !desc.empty(), false, _T("No file description supplied") );

 
     if ( !EnsureExtKeyExists() )
 
     if ( !EnsureExtKeyExists() )

-        return FALSE;
+        return false;

 
     wxRegKey rkey(wxRegKey::HKCR, m_strFileType );
 
 
     wxRegKey rkey(wxRegKey::HKCR, m_strFileType );
 


@@ -754,15 +754,15 @@ bool wxFileTypeImpl::SetDescription (const wxString& desc)
 
 bool wxFileTypeImpl::Unassociate()
 {
 
 bool wxFileTypeImpl::Unassociate()
 {

-    bool result = TRUE;
+    bool result = true;

     if ( !RemoveOpenCommand() )
     if ( !RemoveOpenCommand() )

-        result = FALSE;
+        result = false;

     if ( !RemoveDefaultIcon() )
     if ( !RemoveDefaultIcon() )

-        result = FALSE;
+        result = false;

     if ( !RemoveMimeType() )
     if ( !RemoveMimeType() )

-        result = FALSE;
+        result = false;

    if ( !RemoveDescription() )
    if ( !RemoveDescription() )

-        result = FALSE;
+        result = false;

 
 /*
     //this might hold other keys, eg some have CSLID keys
 
 /*
     //this might hold other keys, eg some have CSLID keys


@@ -784,7 +784,7 @@ bool wxFileTypeImpl::RemoveOpenCommand()
 
 bool wxFileTypeImpl::RemoveCommand(const wxString& verb)
 {
 
 bool wxFileTypeImpl::RemoveCommand(const wxString& verb)
 {

-    wxCHECK_MSG( !m_ext.IsEmpty() && !verb.IsEmpty(), FALSE,
+    wxCHECK_MSG( !m_ext.empty() && !verb.empty(), false,

                  _T("RemoveCommand() needs an extension and a verb") );
 
     wxString  sKey = m_strFileType;
                  _T("RemoveCommand() needs an extension and a verb") );
 
     wxString  sKey = m_strFileType;


@@ -796,7 +796,7 @@ bool wxFileTypeImpl::RemoveCommand(const wxString& verb)
 
 bool wxFileTypeImpl::RemoveMimeType()
 {
 
 bool wxFileTypeImpl::RemoveMimeType()
 {

-    wxCHECK_MSG( !m_ext.IsEmpty(), FALSE, _T("RemoveMimeType() needs extension") );
+    wxCHECK_MSG( !m_ext.empty(), false, _T("RemoveMimeType() needs extension") );

 
     wxRegKey rkey(wxRegKey::HKCR, m_ext);
     return !rkey.Exists() || rkey.DeleteSelf();
 
     wxRegKey rkey(wxRegKey::HKCR, m_ext);
     return !rkey.Exists() || rkey.DeleteSelf();


@@ -804,7 +804,7 @@ bool wxFileTypeImpl::RemoveMimeType()
 
 bool wxFileTypeImpl::RemoveDefaultIcon()
 {
 
 bool wxFileTypeImpl::RemoveDefaultIcon()
 {

-    wxCHECK_MSG( !m_ext.IsEmpty(), FALSE,
+    wxCHECK_MSG( !m_ext.empty(), false,

                  _T("RemoveDefaultIcon() needs extension") );
 
     wxRegKey rkey (wxRegKey::HKCR, m_strFileType  + _T("\\DefaultIcon"));
                  _T("RemoveDefaultIcon() needs extension") );
 
     wxRegKey rkey (wxRegKey::HKCR, m_strFileType  + _T("\\DefaultIcon"));


@@ -813,7 +813,7 @@ bool wxFileTypeImpl::RemoveDefaultIcon()
 
 bool wxFileTypeImpl::RemoveDescription()
 {
 
 bool wxFileTypeImpl::RemoveDescription()
 {

-    wxCHECK_MSG( !m_ext.IsEmpty(), FALSE,
+    wxCHECK_MSG( !m_ext.empty(), false,

                  _T("RemoveDescription() needs extension") );
 
     wxRegKey rkey (wxRegKey::HKCR, m_strFileType );
                  _T("RemoveDescription() needs extension") );
 
     wxRegKey rkey (wxRegKey::HKCR, m_strFileType );