1. wxStaticBitmap now uses mask even for bitmaps (and not only icons)

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

diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index 8130ffda6ee7db69aeb9287c3474c3f5c8efb169..3e74741551d805a62cfbd2d560270455388a8d1c 100644 (file)
--- a/src/unix/mimetype.cpp
+++ b/src/unix/mimetype.cpp
@@ -560,8 +560,14 @@ void wxGNOMEIconHandler::GetMimeInfoRecords(wxMimeTypesManagerImpl *manager)
     }
 }
 
+#if wxUSE_GUI
+    #define WXUNUSED_UNLESS_GUI(p)  p
+#else
+    #define WXUNUSED_UNLESS_GUI(p)
+#endif
 
-bool wxGNOMEIconHandler::GetIcon(const wxString& mimetype, wxIcon *icon)
+bool wxGNOMEIconHandler::GetIcon(const wxString& mimetype,
+                                 wxIcon * WXUNUSED_UNLESS_GUI(icon))
 {
     if ( !m_inited )
     {
@@ -581,8 +587,11 @@ bool wxGNOMEIconHandler::GetIcon(const wxString& mimetype, wxIcon *icon)
         icn = wxIcon(iconname);
     else
         icn = wxIcon(iconname, wxBITMAP_TYPE_ANY);
-    if (icn.Ok()) *icon = icn;
-    else return FALSE;
+    if ( !icn.Ok() )
+        return FALSE;
+
+    if ( icon )
+        *icon = icn;
 #else
     // helpful for testing in console mode
     wxLogDebug(_T("Found GNOME icon for '%s': '%s'\n"),
@@ -789,6 +798,7 @@ void wxKDEIconHandler::Init()
         dirs.Add(_T("/usr/share"));
         dirs.Add(_T("/opt/kde/share"));
         icondirs.Add(_T("/usr/share/icons/"));
+        icondirs.Add(_T("/usr/X11R6/share/icons/")); // Debian/Corel linux
         icondirs.Add(_T("/opt/kde/share/icons/"));
     }
 
@@ -801,7 +811,8 @@ void wxKDEIconHandler::Init()
     m_inited = TRUE;
 }
 
-bool wxKDEIconHandler::GetIcon(const wxString& mimetype, wxIcon *icon)
+bool wxKDEIconHandler::GetIcon(const wxString& mimetype,
+                               wxIcon * WXUNUSED_UNLESS_GUI(icon))
 {
     if ( !m_inited )
     {
@@ -821,8 +832,12 @@ bool wxKDEIconHandler::GetIcon(const wxString& mimetype, wxIcon *icon)
         icn = wxIcon(iconname);
     else
         icn = wxIcon(iconname, wxBITMAP_TYPE_ANY);
-    if (icn.Ok()) *icon = icn;
-    else return FALSE;
+
+    if ( !icn.Ok() )
+        return FALSE;
+
+    if ( icon )
+        *icon = icn;
 #else
     // helpful for testing in console mode
     wxLogDebug(_T("Found KDE icon for '%s': '%s'\n"),