Fix for scroll position being changed when partial layout is done

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

diff --git a/src/generic/filepickerg.cpp b/src/generic/filepickerg.cpp
index 55583a121e67c25ce22caa6626d0684d7e4993ac..3d5b975a9a17a05c901515e6cfc0a97f834a6191 100644 (file)
--- a/src/generic/filepickerg.cpp
+++ b/src/generic/filepickerg.cpp
@@ -26,8 +26,11 @@
 
 #if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
 
 
 #if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
 

+#include "wx/filename.h"

 #include "wx/filepicker.h"
 
 #include "wx/filepicker.h"
 

+#include "wx/scopedptr.h"
+

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -40,22 +43,45 @@ IMPLEMENT_DYNAMIC_CLASS(wxGenericDirButton, wxButton)
 // wxGenericFileButton
 // ----------------------------------------------------------------------------
 
 // wxGenericFileButton
 // ----------------------------------------------------------------------------
 

-bool wxGenericFileDirButton::Create( wxWindow *parent, wxWindowID id,
-                        const wxString &label, const wxString &path,
-                        const wxString &message, const wxString &wildcard,
-                        const wxPoint &pos, const wxSize &size, long style,
-                        const wxValidator& validator, const wxString &name)
+bool wxGenericFileDirButton::Create(wxWindow *parent,
+                                    wxWindowID id,
+                                    const wxString& label,
+                                    const wxString& path,
+                                    const wxString& message,
+                                    const wxString& wildcard,
+                                    const wxPoint& pos,
+                                    const wxSize& size,
+                                    long style,
+                                    const wxValidator& validator,
+                                    const wxString& name)

 {
 {

+    m_pickerStyle = style;
+
+    // If the special wxPB_SMALL flag is used, ignore the provided label and
+    // use the shortest possible label and the smallest possible button fitting
+    // it.
+    long styleButton = 0;
+    wxString labelButton;
+    if ( m_pickerStyle & wxPB_SMALL )
+    {
+        labelButton = _("...");
+        styleButton = wxBU_EXACTFIT;
+    }
+    else
+    {
+        labelButton = label;
+    }
+

     // create this button
     // create this button

-    if (!wxButton::Create(parent, id, label, pos, size, style,
-                          validator, name))
+    if ( !wxButton::Create(parent, id, labelButton,
+                           pos, size, styleButton, validator, name) )

     {
         wxFAIL_MSG( wxT("wxGenericFileButton creation failed") );
         return false;
     }
 
     // and handle user clicks on it
     {
         wxFAIL_MSG( wxT("wxGenericFileButton creation failed") );
         return false;
     }
 
     // and handle user clicks on it

-    Connect(wxEVT_COMMAND_BUTTON_CLICKED,
+    Connect(GetId(), wxEVT_COMMAND_BUTTON_CLICKED,

             wxCommandEventHandler(wxGenericFileDirButton::OnButtonClick),
             NULL, this);
 
             wxCommandEventHandler(wxGenericFileDirButton::OnButtonClick),
             NULL, this);
 


@@ -69,18 +95,80 @@ bool wxGenericFileDirButton::Create( wxWindow *parent, wxWindowID id,
 
 void wxGenericFileDirButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev))
 {
 
 void wxGenericFileDirButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev))
 {

-    wxDialog *p = CreateDialog();
+    wxScopedPtr<wxDialog> p(CreateDialog());

     if (p->ShowModal() == wxID_OK)
     {
         // save updated path in m_path
     if (p->ShowModal() == wxID_OK)
     {
         // save updated path in m_path

-        UpdatePathFromDialog(p);
+        UpdatePathFromDialog(p.get());

 
         // fire an event
         wxFileDirPickerEvent event(GetEventType(), this, GetId(), m_path);
         GetEventHandler()->ProcessEvent(event);
     }
 
         // fire an event
         wxFileDirPickerEvent event(GetEventType(), this, GetId(), m_path);
         GetEventHandler()->ProcessEvent(event);
     }

+}
+
+void wxGenericFileDirButton::SetInitialDirectory(const wxString& dir)
+{
+    m_initialDir = dir;
+}
+
+// ----------------------------------------------------------------------------
+// wxGenericFileutton
+// ----------------------------------------------------------------------------

 
 

-    wxDELETE(p);
+void
+wxGenericFileButton::DoSetInitialDirectory(wxFileDialog* dialog,
+                                           const wxString& dir)
+{
+    if ( m_path.find_first_of(wxFileName::GetPathSeparators()) ==
+            wxString::npos )
+    {
+        dialog->SetDirectory(dir);
+    }
+}
+
+wxDialog *wxGenericFileButton::CreateDialog()
+{
+    wxFileDialog* const dialog = new wxFileDialog
+                                     (
+                                        GetDialogParent(),
+                                        m_message,
+                                        wxEmptyString,
+                                        wxEmptyString,
+                                        m_wildcard,
+                                        GetDialogStyle()
+                                     );
+
+    // If there is no default file or if it doesn't have any path, use the
+    // explicitly set initial directory.
+    //
+    // Notice that it is important to call this before SetPath() below as if we
+    // do have m_initialDir and no directory in m_path, we need to interpret
+    // the path as being relative with respect to m_initialDir.
+    if ( !m_initialDir.empty() )
+        DoSetInitialDirectory(dialog, m_initialDir);
+
+    // This sets both the default file name and the default directory of the
+    // dialog if m_path contains directory part.
+    dialog->SetPath(m_path);
+
+    return dialog;
+}
+
+// ----------------------------------------------------------------------------
+// wxGenericDirButton
+// ----------------------------------------------------------------------------
+
+wxDialog *wxGenericDirButton::CreateDialog()
+{
+    wxDirDialog* const dialog = new wxDirDialog
+                                    (
+                                        GetDialogParent(),
+                                        m_message,
+                                        m_path.empty() ? m_initialDir : m_path,
+                                        GetDialogStyle()
+                                    );
+    return dialog;

 }
 
 #endif      // wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
 }
 
 #endif      // wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL