Added wxDbTable::SetOrderByColNums() function

[wxWidgets.git] / user / wxFile / filectrl.cpp

diff --git a/user/wxFile/filectrl.cpp b/user/wxFile/filectrl.cpp
index d84f4683607f8003ab2da95d21ff0317ae4c97dc..5fb6510d106662c380e9e6b9a6dfb81bd9c86759 100644 (file)
--- a/user/wxFile/filectrl.cpp
+++ b/user/wxFile/filectrl.cpp
@@ -209,7 +209,7 @@ BEGIN_EVENT_TABLE(wxFileCtrl,wxListCtrl)
   EVT_SET_FOCUS     (wxFileCtrl::OnSetFocus)
 END_EVENT_TABLE()
 
-wxFileCtrl *wxFileCtrl::m_lastFocus = NULL;
+wxFileCtrl *wxFileCtrl::m_lastFocus = (wxFileCtrl *) NULL;
 
 wxFileCtrl::wxFileCtrl( void )
 {
@@ -241,7 +241,7 @@ wxFileCtrl::wxFileCtrl( wxWindow *win, const wxWindowID id, const wxString &dirN
   m_dragStartY = 0;
   m_dragCount = 0;
     
-  SetDropTarget( new wxFileDropTarget() );
+//  SetDropTarget( new wxFileDropTarget() );
 };
 
 void wxFileCtrl::ChangeToListMode()
@@ -290,7 +290,7 @@ void wxFileCtrl::Update( void )
     InsertColumn( 3, "Time", wxLIST_FORMAT_LEFT, 50 );
     InsertColumn( 4, "Permissions", wxLIST_FORMAT_LEFT, 120 );
   };
-  wxFileData *fd = NULL;
+  wxFileData *fd = (wxFileData *) NULL;
   wxListItem item;
   item.m_mask = wxLIST_MASK_TEXT + wxLIST_MASK_DATA;
   if (my_style & wxLC_ICON) item.m_mask += wxLIST_MASK_IMAGE;