Fix horizontal mouse wheel scrolling in wxGTK.

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

diff --git a/src/generic/filepickerg.cpp b/src/generic/filepickerg.cpp
index ce5efc0d4cefc8006eb89a4f0d9e36f009bb8c87..225da729d28cf41cdce45848d074939929dadb3d 100644 (file)
--- a/src/generic/filepickerg.cpp
+++ b/src/generic/filepickerg.cpp
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi
 // Modified by:
 // Created:     15/04/2006
 // Author:      Francesco Montorsi
 // Modified by:
 // Created:     15/04/2006

-// RCS-ID:      $Id$

 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -24,20 +23,18 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-    #include "wx/window.h"
-#endif //WX_PRECOMP
+#if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL

 
 

+#include "wx/filename.h"

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

-#include "wx/filedlg.h"
+
+#include "wx/scopedptr.h"

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

-#if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
-

 IMPLEMENT_DYNAMIC_CLASS(wxGenericFileButton, wxButton)
 IMPLEMENT_DYNAMIC_CLASS(wxGenericDirButton, wxButton)
 
 IMPLEMENT_DYNAMIC_CLASS(wxGenericFileButton, wxButton)
 IMPLEMENT_DYNAMIC_CLASS(wxGenericDirButton, wxButton)
 


@@ -45,51 +42,114 @@ IMPLEMENT_DYNAMIC_CLASS(wxGenericDirButton, wxButton)
 // wxGenericFileButton
 // ----------------------------------------------------------------------------
 
 // wxGenericFileButton
 // ----------------------------------------------------------------------------
 

-static wxString s_message, s_wildcard;
-
-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_BUTTON,

             wxCommandEventHandler(wxGenericFileDirButton::OnButtonClick),
             NULL, this);
 
     // create the dialog associated with this button
     m_path = path;
             wxCommandEventHandler(wxGenericFileDirButton::OnButtonClick),
             NULL, this);
 
     // create the dialog associated with this button
     m_path = path;

-    s_message = message;
-    s_wildcard = wildcard;
+    m_message = message;
+    m_wildcard = wildcard;

 
 

-    m_dialog = NULL;

     return true;
 }
 
 void wxGenericFileDirButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev))
 {
     return true;
 }
 
 void wxGenericFileDirButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev))
 {

-    CreateDialog(s_message, s_wildcard);
-
-    if (m_dialog->ShowModal() == wxID_OK)
+    wxScopedPtr<wxDialog> p(CreateDialog());
+    if (p->ShowModal() == wxID_OK)

     {
     {

-        // save the path
-        UpdatePathFromDialog();
+        // save updated path in m_path
+        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;
+}

 
 

-    wxDELETE(m_dialog);
+// ----------------------------------------------------------------------------
+// wxGenericFileButton
+// ----------------------------------------------------------------------------
+
+wxDialog *wxGenericFileButton::CreateDialog()
+{
+    // Determine the initial directory for the dialog: it comes either from the
+    // default path, if it has it, or from the separately specified initial
+    // directory that can be set even if the path is e.g. empty.
+    wxFileName fn(m_path);
+    wxString initialDir = fn.GetPath();
+    if ( initialDir.empty() )
+        initialDir = m_initialDir;
+
+    return new wxFileDialog
+               (
+                    GetDialogParent(),
+                    m_message,
+                    initialDir,
+                    fn.GetFullName(),
+                    m_wildcard,
+                    GetDialogStyle()
+               );
+}
+
+// ----------------------------------------------------------------------------
+// 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