Dialog Editor bug fixes, several other small ones

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

diff --git a/user/wxFile/filectrl.cpp b/user/wxFile/filectrl.cpp
index 3dcbf7050dba2b2d47da49ccd84b3bd523a98943..5fb6510d106662c380e9e6b9a6dfb81bd9c86759 100644 (file)
--- a/user/wxFile/filectrl.cpp
+++ b/user/wxFile/filectrl.cpp
@@ -206,10 +206,10 @@ void wxFileData::MakeItem( wxListItem &item )
 IMPLEMENT_DYNAMIC_CLASS(wxFileCtrl,wxListCtrl);
 
 BEGIN_EVENT_TABLE(wxFileCtrl,wxListCtrl)
-  EVT_SET_FOCUS   (wxFileCtrl::OnSetFocus)
+  EVT_SET_FOCUS     (wxFileCtrl::OnSetFocus)
 END_EVENT_TABLE()
 
-wxFileCtrl *wxFileCtrl::m_lastFocus = NULL;
+wxFileCtrl *wxFileCtrl::m_lastFocus = (wxFileCtrl *) NULL;
 
 wxFileCtrl::wxFileCtrl( void )
 {
@@ -222,8 +222,8 @@ wxFileCtrl::wxFileCtrl( wxWindow *win, const wxWindowID id, const wxString &dirN
       const long style, const wxString &name ) :
   wxListCtrl( win, id, pos, size, style, name )
 {
-  SetItemSpacing( 20 );
-  wxImageList *imageList = new wxImageList( 18, 18 );
+  SetItemSpacing( 40 );
+  wxImageList *imageList = new wxImageList( 30, 30 );
   imageList->Add( wxBitmap( folder_xpm ) );
   imageList->Add( wxBitmap( txt_xpm ) );
   imageList->Add( wxBitmap( list_xpm ) );
@@ -236,8 +236,12 @@ wxFileCtrl::wxFileCtrl( wxWindow *win, const wxWindowID id, const wxString &dirN
   Update();
   
   m_lastFocus = this;
-  
-  SetDropTarget( new wxTextDropTarget() );
+
+  m_dragStartX = 0;
+  m_dragStartY = 0;
+  m_dragCount = 0;
+    
+//  SetDropTarget( new wxFileDropTarget() );
 };
 
 void wxFileCtrl::ChangeToListMode()
@@ -286,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;
@@ -538,4 +542,3 @@ void wxFileCtrl::OnSetFocus( wxFocusEvent &event )
   event.Skip();
 };
 
-