Fix toolbar background painting whem comctl32 < 6

[wxWidgets.git] / src / common / filepickercmn.cpp

diff --git a/src/common/filepickercmn.cpp b/src/common/filepickercmn.cpp
index 3d09ab700b0ead5f590e8db07aa4fcafc13bff8b..53514e3643014a6d99e58db0323ed0cc10a08b77 100644 (file)
--- a/src/common/filepickercmn.cpp
+++ b/src/common/filepickercmn.cpp
@@ -27,6 +27,11 @@
 #if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
 
 #include "wx/filepicker.h"
+#include "wx/filename.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/textctrl.h"
+#endif
 
 // ============================================================================
 // implementation
@@ -40,8 +45,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileDirPickerEvent, wxCommandEvent)
 // wxFileDirPickerCtrlBase
 // ----------------------------------------------------------------------------
 
-#define M_PICKER     ((wxFilePickerWidget*)m_picker)
-
 bool wxFileDirPickerCtrlBase::CreateBase( wxWindow *parent, wxWindowID id,
                         const wxString &path, const wxString &message,
                         const wxString &wildcard,
@@ -49,7 +52,7 @@ bool wxFileDirPickerCtrlBase::CreateBase( wxWindow *parent, wxWindowID id,
                         long style, const wxValidator& validator,
                         const wxString &name )
 {
-    wxASSERT_MSG(path.empty() || CheckPath(path), wxT("Invalid initial path !"));
+    wxASSERT_MSG(path.empty() || CheckPath(path), wxT("Invalid initial path!"));
 
     if (!wxPickerBase::CreateBase(parent, id, path, pos, size,
                                    style, validator, name))
@@ -69,8 +72,14 @@ bool wxFileDirPickerCtrlBase::CreateBase( wxWindow *parent, wxWindowID id,
                   _T("wxFLP_OVERWRITE_PROMPT can't be used with wxFLP_OPEN") );
 
     // create a wxFilePickerWidget or a wxDirPickerWidget...
-    if (!CreatePicker(this, path, message, wildcard))
+    m_pickerIface = CreatePicker(this, path, message, wildcard);
+    if ( !m_pickerIface )
         return false;
+    m_picker = m_pickerIface->AsControl();
+
+    // complete sizer creation
+    wxPickerBase::PostCreation();
+
     m_picker->Connect(GetEventType(),
             wxFileDirPickerEventHandler(wxFileDirPickerCtrlBase::OnFileDirChange),
             NULL, this);
@@ -82,9 +91,14 @@ bool wxFileDirPickerCtrlBase::CreateBase( wxWindow *parent, wxWindowID id,
     return true;
 }
 
+wxString wxFileDirPickerCtrlBase::GetPath() const
+{
+    return m_pickerIface->GetPath();
+}
+
 void wxFileDirPickerCtrlBase::SetPath(const wxString &path)
 {
-    M_PICKER->SetPath(path);
+    m_pickerIface->SetPath(path);
     UpdateTextCtrlFromPicker();
 }
 
@@ -102,21 +116,19 @@ void wxFileDirPickerCtrlBase::UpdatePickerFromTextCtrl()
     // remove the eventually present path-separator from the end of the textctrl
     // string otherwise we would generate a wxFileDirPickerEvent when changing
     // from e.g. /home/user to /home/user/ and we want to avoid it !
-    wxString newpath(m_text->GetValue());
-    if (!newpath.empty() && wxFileName::IsPathSeparator(newpath.Last()))
-        newpath.RemoveLast();
+    wxString newpath(GetTextCtrlValue());
     if (!CheckPath(newpath))
         return;       // invalid user input
 
-    if (M_PICKER->GetPath() != newpath)
+    if (m_pickerIface->GetPath() != newpath)
     {
-        M_PICKER->SetPath(newpath);
+        m_pickerIface->SetPath(newpath);
 
         // update current working directory, if necessary
         // NOTE: the path separator is required because if newpath is "C:"
         //       then no change would happen
         if (IsCwdToUpdate())
-            wxSetWorkingDirectory(newpath + wxFileName::GetPathSeparator());
+            wxSetWorkingDirectory(newpath);
 
         // fire an event
         wxFileDirPickerEvent event(GetEventType(), this, GetId(), newpath);
@@ -133,7 +145,7 @@ void wxFileDirPickerCtrlBase::UpdateTextCtrlFromPicker()
     //       which will trigger a unneeded UpdateFromTextCtrl(); thus before using
     //       SetValue() we set the m_bIgnoreNextTextCtrlUpdate flag...
     m_bIgnoreNextTextCtrlUpdate = true;
-    m_text->SetValue(M_PICKER->GetPath());
+    m_text->SetValue(m_pickerIface->GetPath());
 }
 
 
@@ -154,9 +166,48 @@ void wxFileDirPickerCtrlBase::OnFileDirChange(wxFileDirPickerEvent &ev)
 
 #endif  // wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
 
+// ----------------------------------------------------------------------------
+// wxFileDirPickerCtrl
+// ----------------------------------------------------------------------------
+
 #if wxUSE_FILEPICKERCTRL
+
 IMPLEMENT_DYNAMIC_CLASS(wxFilePickerCtrl, wxPickerBase)
-#endif
+
+bool wxFilePickerCtrl::CheckPath(const wxString& path) const
+{
+    // if wxFLP_SAVE was given or wxFLP_FILE_MUST_EXIST has NOT been given we
+    // must accept any path
+    return HasFlag(wxFLP_SAVE) ||
+            !HasFlag(wxFLP_FILE_MUST_EXIST) ||
+                wxFileName::FileExists(path);
+}
+
+wxString wxFilePickerCtrl::GetTextCtrlValue() const
+{
+    // filter it through wxFileName to remove any spurious path separator
+    return wxFileName(m_text->GetValue()).GetFullPath();
+}
+
+#endif // wxUSE_FILEPICKERCTRL
+
+// ----------------------------------------------------------------------------
+// wxDirPickerCtrl
+// ----------------------------------------------------------------------------
+
 #if wxUSE_DIRPICKERCTRL
 IMPLEMENT_DYNAMIC_CLASS(wxDirPickerCtrl, wxPickerBase)
-#endif
+
+bool wxDirPickerCtrl::CheckPath(const wxString& path) const
+{
+    // if wxDIRP_DIR_MUST_EXIST has NOT been given we must accept any path
+    return !HasFlag(wxDIRP_DIR_MUST_EXIST) || wxFileName::DirExists(path);
+}
+
+wxString wxDirPickerCtrl::GetTextCtrlValue() const
+{
+    // filter it through wxFileName to remove any spurious path separator
+    return wxFileName::DirName(m_text->GetValue()).GetPath();
+}
+
+#endif // wxUSE_DIRPICKERCTRL