fix missing and broken interface items for Phoenix

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

diff --git a/src/generic/filectrlg.cpp b/src/generic/filectrlg.cpp
index 3ab54d312b3a5517569b20c05ea055a6c0a0c2ee..0a697894dc60334e2fe1a64e7447e514e080ad07 100644 (file)
--- a/src/generic/filectrlg.cpp
+++ b/src/generic/filectrlg.cpp
@@ -53,7 +53,7 @@
 // ----------------------------------------------------------------------------
 
 static
 // ----------------------------------------------------------------------------
 
 static

-int wxCALLBACK wxFileDataNameCompare( long data1, long data2, wxIntPtr sortOrder)
+int wxCALLBACK wxFileDataNameCompare( wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder)

 {
      wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
      wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
 {
      wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
      wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);


@@ -71,7 +71,7 @@ int wxCALLBACK wxFileDataNameCompare( long data1, long data2, wxIntPtr sortOrder
 }
 
 static
 }
 
 static

-int wxCALLBACK wxFileDataSizeCompare(long data1, long data2, wxIntPtr sortOrder)
+int wxCALLBACK wxFileDataSizeCompare(wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder)

 {
      wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
      wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
 {
      wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
      wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);


@@ -93,7 +93,7 @@ int wxCALLBACK wxFileDataSizeCompare(long data1, long data2, wxIntPtr sortOrder)
 }
 
 static
 }
 
 static

-int wxCALLBACK wxFileDataTypeCompare(long data1, long data2, wxIntPtr sortOrder)
+int wxCALLBACK wxFileDataTypeCompare(wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder)

 {
      wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
      wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
 {
      wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
      wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);


@@ -115,7 +115,7 @@ int wxCALLBACK wxFileDataTypeCompare(long data1, long data2, wxIntPtr sortOrder)
 }
 
 static
 }
 
 static

-int wxCALLBACK wxFileDataTimeCompare(long data1, long data2, wxIntPtr sortOrder)
+int wxCALLBACK wxFileDataTimeCompare(wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder)

 {
      wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
      wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
 {
      wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
      wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);


@@ -377,7 +377,7 @@ void wxFileData::MakeItem( wxListItem &item )
     if (IsLink())
     {
         wxColour dg = wxTheColourDatabase->Find( wxT("MEDIUM GREY") );
     if (IsLink())
     {
         wxColour dg = wxTheColourDatabase->Find( wxT("MEDIUM GREY") );

-        if ( dg.Ok() )
+        if ( dg.IsOk() )

             item.SetTextColour(dg);
     }
     item.m_data = wxPtrToUInt(this);
             item.SetTextColour(dg);
     }
     item.m_data = wxPtrToUInt(this);


@@ -677,14 +677,14 @@ void wxFileListCtrl::MakeDir()
     wxListItem item;
     item.m_itemId = 0;
     item.m_col = 0;
     wxListItem item;
     item.m_itemId = 0;
     item.m_col = 0;

-    long id = Add( fd, item );
+    long itemid = Add( fd, item );

 
 

-    if (id != -1)
+    if (itemid != -1)

     {
         SortItems(m_sort_field, m_sort_forward);
     {
         SortItems(m_sort_field, m_sort_forward);

-        id = FindItem( 0, wxPtrToUInt(fd) );
-        EnsureVisible( id );
-        EditLabel( id );
+        itemid = FindItem( 0, wxPtrToUInt(fd) );
+        EnsureVisible( itemid );
+        EditLabel( itemid );

     }
     else
         delete fd;
     }
     else
         delete fd;


@@ -1184,6 +1184,8 @@ void wxGenericFileCtrl::DoSetFilterIndex( int filterindex )
     {
         m_filterExtension.clear();
     }
     {
         m_filterExtension.clear();
     }

+
+    GenerateFilterChangedEvent( this, this );

 }
 
 void wxGenericFileCtrl::SetWildcard( const wxString& wildCard )
 }
 
 void wxGenericFileCtrl::SetWildcard( const wxString& wildCard )