1. warning in wxDataObject fixed

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

diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp
index 5f23be06812049a9dbd60a7f2df442a1927a262a..023ca20c91a41749ce2a45a6813a8a2584b5a467 100644 (file)
--- a/src/generic/dirdlgg.cpp
+++ b/src/generic/dirdlgg.cpp
@@ -12,6 +12,13 @@
 #pragma implementation "dirdlgg.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
 #include "wx/defs.h"
 #include "wx/utils.h"
 #include "wx/dialog.h"
@@ -27,6 +34,11 @@
 
 #include "wx/generic/dirdlgg.h"
 
+// If compiled under Windows, this macro can cause problems
+#ifdef GetFirstChild
+#undef GetFirstChild
+#endif
+
 /* XPM */
 static char * icon1_xpm[] = {
 /* width height ncolors chars_per_pixel */
@@ -126,8 +138,8 @@ class wxDirCtrl: public wxTreeCtrl
              const wxSize& size = wxDefaultSize,
              const long style = wxTR_HAS_BUTTONS,
              const wxString& name = "wxTreeCtrl" );
-    void OnExpandItem( const wxTreeEvent &event );
-    void OnCollapseItem( const wxTreeEvent &event );
+    void OnExpandItem(wxTreeEvent &event );
+    void OnCollapseItem(wxTreeEvent &event );
     void ShowHidden( const bool yesno );
     DECLARE_EVENT_TABLE()
  protected:
@@ -208,15 +220,15 @@ void wxDirCtrl::SetupSections()
 
   m_paths.Clear();
   m_names.Clear();
-  ADD_SECTION("/", _("The Computer") )
+  ADD_SECTION(_T("/"), _("The Computer") )
   wxGetHomeDir(&home);
   ADD_SECTION(home, _("My Home") )
-  ADD_SECTION("/mnt", _("Mounted Devices") )
-  ADD_SECTION("/usr", _("User") )
-  ADD_SECTION("/usr/local", _("User Local") )
-  ADD_SECTION("/var", _("Variables") )
-  ADD_SECTION("/etc", _("Etcetera") )
-  ADD_SECTION("/tmp", _("Temporary") )
+  ADD_SECTION(_T("/mnt"), _("Mounted Devices") )
+  ADD_SECTION(_T("/usr"), _("User") )
+  ADD_SECTION(_T("/usr/local"), _("User Local") )
+  ADD_SECTION(_T("/var"), _("Variables") )
+  ADD_SECTION(_T("/etc"), _("Etcetera") )
+  ADD_SECTION(_T("/tmp"), _("Temporary") )
 }
 #undef ADD_SECTION
 
@@ -235,7 +247,7 @@ void wxDirCtrl::CreateItems(const wxTreeItemId &parent)
   }
 }
 
-void wxDirCtrl::OnExpandItem( const wxTreeEvent &event )
+void wxDirCtrl::OnExpandItem(wxTreeEvent &event )
 {
   if (event.GetItem() == m_rootId)
   {
@@ -268,10 +280,12 @@ void wxDirCtrl::OnExpandItem( const wxTreeEvent &event )
   }
   CreateItems(event.GetItem());
   wxEndBusyCursor();
+  
+  SortChildren( event.GetItem() );
 };
 
 
-void wxDirCtrl::OnCollapseItem( const wxTreeEvent &event )
+void wxDirCtrl::OnCollapseItem(wxTreeEvent &event )
 {
   wxTreeItemId child, parent = event.GetItem();
   long cookie;
@@ -324,7 +338,7 @@ wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message,
   m_input = new wxTextCtrl( this, ID_TEXTCTRL, m_path, wxDefaultPosition ); 
   // m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden") );
   m_ok = new wxButton( this, ID_OK, _("OK") );
-  m_cancel = new wxButton( this, ID_CANCEL, _("Cancel") );
+  m_cancel = new wxButton( this, ID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize(75,-1) );
   m_new = new wxButton( this, ID_NEW, _("New...") );
 
   // m_check->SetValue(TRUE);
@@ -350,7 +364,7 @@ void wxDirDialog::doSize()
   m_input->GetSize(&w,&h2); h -= h2;
   m_ok->GetSize(&w, &h2); h -= h2;
   //m_check->GetSize(&w, &h2); h -= h2;
-  h -= 20;
+  h -= 30;
 
   wxLayoutConstraints *c = new wxLayoutConstraints;
   c->left.SameAs       (this, wxLeft,5);
@@ -376,14 +390,14 @@ void wxDirDialog::doSize()
   c = new wxLayoutConstraints;
   c->width.SameAs      (m_cancel, wxWidth);
   c->height.AsIs       ();
-  c->top.Below         (m_input,5);
-  c->centreX.PercentOf (this, wxWidth, 25);
+  c->top.Below         (m_input,10);
+  c->centreX.PercentOf (this, wxWidth, 20);
   m_ok->SetConstraints(c);
 
   c = new wxLayoutConstraints;
   c->width.SameAs      (m_cancel, wxWidth);
   c->height.AsIs       ();
-  c->top.Below         (m_input,5);
+  c->top.Below         (m_input,10);
   c->bottom.SameAs      (this, wxBottom, 5);
   c->centreX.PercentOf (this, wxWidth, 50);
   m_new->SetConstraints(c);
@@ -391,8 +405,8 @@ void wxDirDialog::doSize()
   c = new wxLayoutConstraints;
   c->width.AsIs                ();
   c->height.AsIs       ();
-  c->top.Below         (m_input,5);
-  c->centreX.PercentOf (this, wxWidth, 75);
+  c->top.Below         (m_input,10);
+  c->centreX.PercentOf (this, wxWidth, 80);
   m_cancel->SetConstraints(c);
 
   Layout();
@@ -412,7 +426,7 @@ void wxDirDialog::OnTreeSelected( wxTreeEvent &event )
     m_input->SetValue( *(data->m_path) );
 };
 
-void wxDirDialog::OnTreeKeyDown( wxKeyEvent &WXUNUSED(event) )
+void wxDirDialog::OnTreeKeyDown( wxTreeEvent &WXUNUSED(event) )
 {
   wxDirItemData *data = 
     (wxDirItemData*)m_dir->GetItemData(m_dir->GetSelection());