// Created: 23.09.98
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence: wxWindows license (part of wxExtra library)
+// Licence: wxWindows licence (part of wxExtra library)
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#include "wx/log.h"
#include "wx/file.h"
+#include "wx/iconloc.h"
#include "wx/intl.h"
#include "wx/dynarray.h"
#include "wx/confbase.h"
m_strFileType = strFileType;
if ( !strFileType ) {
- m_strFileType = m_ext.AfterFirst('.') + "_auto_file";
+ m_strFileType = m_ext.AfterFirst('.') + _T("_auto_file");
}
}
// get it from the registry
wxFileTypeImpl *self = wxConstCast(this, wxFileTypeImpl);
wxRegKey rkey(wxRegKey::HKCR, m_ext);
- if ( !rkey.Exists() || !rkey.QueryValue(_T(""), self->m_strFileType) )
+ if ( !rkey.Exists() || !rkey.QueryValue(wxEmptyString, self->m_strFileType) )
{
wxLogDebug(_T("Can't get the filetype for extension '%s'."),
m_ext.c_str());
wxRegKey rkey(wxRegKey::HKCR, m_ext);
if ( !rkey.Exists() )
{
- if ( !rkey.Create() || !rkey.SetValue(_T(""), m_strFileType) )
+ if ( !rkey.Create() || !rkey.SetValue(wxEmptyString, m_strFileType) )
{
wxLogError(_("Failed to create registry entry for '%s' files."),
m_ext.c_str());
wxString command;
if ( key.Open() ) {
// it's the default value of the key
- if ( key.QueryValue(wxT(""), command) ) {
+ if ( key.QueryValue(wxEmptyString, command) ) {
// transform it from '%1' to '%s' style format string (now also
// test for %L - apparently MS started using it as well for the
// same purpose)
wxRegKey keyDDE(wxRegKey::HKCR, strKey);
if ( keyDDE.Open() ) {
wxString ddeCommand, ddeServer, ddeTopic;
- keyDDE.QueryValue(_T(""), ddeCommand);
+ keyDDE.QueryValue(wxEmptyString, ddeCommand);
ddeCommand.Replace(_T("%1"), _T("%s"));
wxRegKey(wxRegKey::HKCR, strKey + _T("\\Application")).
- QueryValue(_T(""), ddeServer);
+ QueryValue(wxEmptyString, ddeServer);
wxRegKey(wxRegKey::HKCR, strKey + _T("\\Topic")).
- QueryValue(_T(""), ddeTopic);
+ QueryValue(wxEmptyString, 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
}
-bool wxFileTypeImpl::GetIcon(wxIcon *icon,
- wxString *iconFile,
- int *iconIndex) const
+bool wxFileTypeImpl::GetIcon(wxIconLocation *iconLoc) const
{
-#if wxUSE_GUI
wxString strIconKey;
strIconKey << m_strFileType << wxT("\\DefaultIcon");
if ( key.Open() ) {
wxString strIcon;
// it's the default value of the key
- if ( key.QueryValue(wxT(""), strIcon) ) {
+ if ( key.QueryValue(wxEmptyString, strIcon) ) {
// the format is the following: <full path to file>, <icon index>
// NB: icon index may be negative as well as positive and the full
// path may contain the environment variables inside '%'
strIndex = wxT("0");
}
- wxString strExpPath = wxExpandEnvVars(strFullPath);
- // here we need C based counting!
- int nIndex = wxAtoi(strIndex);
-
- HICON hIcon = ExtractIcon(GetModuleHandle(NULL), strExpPath, nIndex);
- switch ( (int)hIcon ) {
- case 0: // means no icons were found
- case 1: // means no such file or it wasn't a DLL/EXE/OCX/ICO/...
- wxLogDebug(wxT("incorrect registry entry '%s': no such icon."),
- key.GetName().c_str());
- break;
-
- default:
- icon->SetHICON((WXHICON)hIcon);
- wxSize size = wxGetHiconSize(hIcon);
- icon->SetSize(size);
- if ( iconIndex )
- *iconIndex = nIndex;
- if ( iconFile )
- *iconFile = strFullPath;
- return TRUE;
+ if ( iconLoc )
+ {
+ iconLoc->SetFileName(wxExpandEnvVars(strFullPath));
+
+ iconLoc->SetIndex(wxAtoi(strIndex));
}
+
+ return TRUE;
}
}
// no such file type or no value or incorrect icon entry
-#endif // wxUSE_GUI
-
return FALSE;
}
if ( key.Open() ) {
// it's the default value of the key
- if ( key.QueryValue(wxT(""), *desc) ) {
+ if ( key.QueryValue(wxEmptyString, *desc) ) {
return TRUE;
}
}
wxRegKey key(wxRegKey::HKCR, str);
if ( key.Open() ) {
// it's the default value of the key
- if ( key.QueryValue(wxT(""), strFileType) ) {
+ if ( key.QueryValue(wxEmptyString, strFileType) ) {
// create the new wxFileType object
return CreateFileType(strFileType, ext);
}
filetype = filetypeOrig;
}
- ok = key.SetValue(_T(""), filetype);
+ ok = key.SetValue(wxEmptyString, filetype);
}
}
else
if (!filetypeOrig.empty())
{
filetype = filetypeOrig;
- ok = key.SetValue(_T(""), filetype);
+ ok = key.SetValue(wxEmptyString, filetype);
}
else
{
- ok = key.QueryValue(_T(""), filetype);
+ ok = key.QueryValue(wxEmptyString, filetype);
}
}
// now set a mimetypeif we have it, but ignore it if none
wxRegKey key(wxRegKey::HKCR, extWithDot);
if ( !key.Exists() ) ok = key.Create();
- ok = key.SetValue(_T(""), filetype);
+ ok = key.SetValue(wxEmptyString, filetype);
// now set any mimetypes we may have, but ignore it if none
const wxString& mimetype = ftInfo.GetMimeType();
{
#if wxUSE_GUI
wxString old;
- rkey.QueryValue(wxT(""), old);
+ rkey.QueryValue(wxEmptyString, old);
if ( wxMessageBox
(
wxString::Format(
// TODO:
// 1. translate '%s' to '%1' instead of always adding it
// 2. create DDEExec value if needed (undo GetCommand)
- return rkey.Create() && rkey.SetValue(_T(""), cmd + _T(" \"%1\"") );
+ return rkey.Create() && rkey.SetValue(wxEmptyString, cmd + _T(" \"%1\"") );
}
/* // no longer used
wxRegKey rkey(wxRegKey::HKCR, m_strFileType + _T("\\DefaultIcon"));
return rkey.Create() &&
- rkey.SetValue(_T(""),
+ rkey.SetValue(wxEmptyString,
wxString::Format(_T("%s,%d"), cmd.c_str(), index));
}
wxRegKey rkey(wxRegKey::HKCR, m_strFileType );
return rkey.Create() &&
- rkey.SetValue(_T(""), desc);
+ rkey.SetValue(wxEmptyString, desc);
}
// ----------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff