projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved @interface wxNSApplicationDelegate to new header
[wxWidgets.git]
/
src
/
unix
/
mimetype.cpp
diff --git
a/src/unix/mimetype.cpp
b/src/unix/mimetype.cpp
index 1ef3b17521598dbaeb024876d6bb7e4a0339c12b..d5f44157847b65a1c491d3169d2f1d785d534b98 100644
(file)
--- a/
src/unix/mimetype.cpp
+++ b/
src/unix/mimetype.cpp
@@
-40,7
+40,7
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "mimetype.h"
#endif
#pragma implementation "mimetype.h"
#endif
@@
-59,10
+59,6
@@
#ifndef WX_PRECOMP
#include "wx/string.h"
#ifndef WX_PRECOMP
#include "wx/string.h"
- #if wxUSE_GUI
- #include "wx/icon.h"
-
- #endif
#endif //WX_PRECOMP
#endif //WX_PRECOMP
@@
-1821,7
+1817,7
@@
int wxMimeTypesManagerImpl::AddToMimeData(const wxString& strType,
// change nIndex so we can use it below to add the extensions
m_aExtensions.Add(wxEmptyString);
// change nIndex so we can use it below to add the extensions
m_aExtensions.Add(wxEmptyString);
- nIndex = m_aExtensions.size();
+ nIndex = m_aExtensions.size()
- 1
;
m_aDescriptions.Add(strDesc);
}
m_aDescriptions.Add(strDesc);
}
@@
-2177,7
+2173,7
@@
bool wxMimeTypesManagerImpl::ReadMimeTypes(const wxString& strFileName)
else if ( strLHS == wxT("exts") ) {
strExtensions = strRHS;
}
else if ( strLHS == wxT("exts") ) {
strExtensions = strRHS;
}
- else if ( strLHS
!
= _T("icon") )
+ else if ( strLHS
=
= _T("icon") )
{
// this one is simply ignored: it usually refers to Netscape
// built in icons which are useless for us anyhow
{
// this one is simply ignored: it usually refers to Netscape
// built in icons which are useless for us anyhow