Adapted printing samples makefiles.

[wxWidgets.git] / src / generic / dirctrlg.cpp

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 7f1c89e741a1a0af41a94c16800a1f6ac5b0c897..791b3a97a0087fa59845e508c6fc536169d4edd1 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -375,10 +375,6 @@ wxDirItemData::wxDirItemData(const wxString& path, const wxString& name,
     m_isDir = isDir;
 }
 
     m_isDir = isDir;
 }
 

-wxDirItemData::~wxDirItemData()
-{
-}
-

 void wxDirItemData::SetNewDirName(const wxString& path)
 {
     m_path = path;
 void wxDirItemData::SetNewDirName(const wxString& path)
 {
     m_path = path;


@@ -555,8 +551,19 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
     ExpandDir(m_rootId); // automatically expand first level
 
     // Expand and select the default path
     ExpandDir(m_rootId); // automatically expand first level
 
     // Expand and select the default path

-    if (!m_defaultPath.IsEmpty())
+    if (!m_defaultPath.empty())
+    {

         ExpandPath(m_defaultPath);
         ExpandPath(m_defaultPath);

+    }
+#ifdef __UNIX__
+    else
+    {
+        // On Unix, there's only one node under the (hidden) root node. It
+        // represents the / path, so the user would always have to expand it;
+        // let's do it ourselves
+        ExpandPath(wxT("/"));
+    }
+#endif

 
     SetBestSize(size);
     DoResize();
 
     SetBestSize(size);
     DoResize();


@@ -1215,7 +1222,7 @@ void wxDirFilterListCtrl::FillFilterList(const wxString& filter, int defaultFilt
 {
     Clear();
     wxArrayString descriptions, filters;
 {
     Clear();
     wxArrayString descriptions, filters;

-    size_t n = (size_t) wxParseCommonDialogsFilter(filter, filters, descriptions);
+    size_t n = (size_t) wxParseCommonDialogsFilter(filter, descriptions, filters);

 
     if (n > 0 && defaultFilter < (int) n)
     {
 
     if (n > 0 && defaultFilter < (int) n)
     {


@@ -1545,7 +1552,11 @@ static wxBitmap CreateAntialiasedBitmap(const wxImage& img)
             if (smask > 2)
                 ps[0] = ps[1] = ps[2] = mr;
             else
             if (smask > 2)
                 ps[0] = ps[1] = ps[2] = mr;
             else

-                ps[0] = sr >> 2, ps[1] = sg >> 2, ps[2] = sb >> 2;
+            {
+                ps[0] = (unsigned char)(sr >> 2);
+                ps[1] = (unsigned char)(sg >> 2);
+                ps[2] = (unsigned char)(sb >> 2);
+            }

             ps += 3;
         }
         p1 += size*2 * 3, p2 += size*2 * 3;
             ps += 3;
         }
         p1 += size*2 * 3, p2 += size*2 * 3;