Add class factories for filter streams. Also filters now follow the convention

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

diff --git a/src/common/filepickercmn.cpp b/src/common/filepickercmn.cpp
index 27fb86a331e8367a1659f3f221def1010f63231c..97e1913b3471866df137f5502d187f60a53d60be 100644 (file)
--- a/src/common/filepickercmn.cpp
+++ b/src/common/filepickercmn.cpp
@@ -37,6 +37,13 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

+const wxChar wxFilePickerCtrlNameStr[] = wxT("filepicker");
+const wxChar wxFilePickerWidgetNameStr[] = wxT("filepickerwidget");
+const wxChar wxDirPickerCtrlNameStr[] = wxT("dirpicker");
+const wxChar wxDirPickerWidgetNameStr[] = wxT("dirpickerwidget");
+const wxChar wxFilePickerWidgetLabel[] = wxT("Browse");
+const wxChar wxDirPickerWidgetLabel[] = wxT("Browse");
+

 DEFINE_EVENT_TYPE(wxEVT_COMMAND_FILEPICKER_CHANGED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DIRPICKER_CHANGED)
 IMPLEMENT_DYNAMIC_CLASS(wxFileDirPickerEvent, wxCommandEvent)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_FILEPICKER_CHANGED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DIRPICKER_CHANGED)
 IMPLEMENT_DYNAMIC_CLASS(wxFileDirPickerEvent, wxCommandEvent)


@@ -45,16 +52,18 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileDirPickerEvent, wxCommandEvent)
 // wxFileDirPickerCtrlBase
 // ----------------------------------------------------------------------------
 
 // wxFileDirPickerCtrlBase
 // ----------------------------------------------------------------------------
 

-#define M_PICKER     ((wxFilePickerWidget*)m_picker)
-
-bool wxFileDirPickerCtrlBase::CreateBase( wxWindow *parent, wxWindowID id,
-                        const wxString &path, const wxString &message,
-                        const wxString &wildcard,
-                        const wxPoint &pos, const wxSize &size,
-                        long style, const wxValidator& validator,
-                        const wxString &name )
+bool wxFileDirPickerCtrlBase::CreateBase(wxWindow *parent,
+                                         wxWindowID id,
+                                         const wxString &path,
+                                         const wxString &message,
+                                         const wxString &wildcard,
+                                         const wxPoint &pos,
+                                         const wxSize &size,
+                                         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))
 
     if (!wxPickerBase::CreateBase(parent, id, path, pos, size,
                                    style, validator, name))


@@ -74,8 +83,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...
                   _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;
         return false;

+    m_picker = m_pickerIface->AsControl();
+
+    // complete sizer creation
+    wxPickerBase::PostCreation();
+

     m_picker->Connect(GetEventType(),
             wxFileDirPickerEventHandler(wxFileDirPickerCtrlBase::OnFileDirChange),
             NULL, this);
     m_picker->Connect(GetEventType(),
             wxFileDirPickerEventHandler(wxFileDirPickerCtrlBase::OnFileDirChange),
             NULL, this);


@@ -87,9 +102,14 @@ bool wxFileDirPickerCtrlBase::CreateBase( wxWindow *parent, wxWindowID id,
     return true;
 }
 
     return true;
 }
 

+wxString wxFileDirPickerCtrlBase::GetPath() const
+{
+    return m_pickerIface->GetPath();
+}
+

 void wxFileDirPickerCtrlBase::SetPath(const wxString &path)
 {
 void wxFileDirPickerCtrlBase::SetPath(const wxString &path)
 {

-    M_PICKER->SetPath(path);
+    m_pickerIface->SetPath(path);

     UpdateTextCtrlFromPicker();
 }
 
     UpdateTextCtrlFromPicker();
 }
 


@@ -111,9 +131,9 @@ void wxFileDirPickerCtrlBase::UpdatePickerFromTextCtrl()
     if (!CheckPath(newpath))
         return;       // invalid user input
 
     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:"
 
         // update current working directory, if necessary
         // NOTE: the path separator is required because if newpath is "C:"


@@ -136,7 +156,7 @@ void wxFileDirPickerCtrlBase::UpdateTextCtrlFromPicker()
     //       which will trigger a unneeded UpdateFromTextCtrl(); thus before using
     //       SetValue() we set the m_bIgnoreNextTextCtrlUpdate flag...
     m_bIgnoreNextTextCtrlUpdate = true;
     //       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());

 }
 
 
 }