X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e3e65dac0c4e7ad19e3c270caa1e0eea138e5d8d..0b4d4194a26948f4681701ce4b99ac9c665f104e:/user/wxFile/filectrl.cpp diff --git a/user/wxFile/filectrl.cpp b/user/wxFile/filectrl.cpp index d84f468360..5fb6510d10 100644 --- 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;