Added logic, API and docs for wxDataViewModel::HasDefaultCompare indicating a compare...

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

diff --git a/src/common/filepickercmn.cpp b/src/common/filepickercmn.cpp
index 1282f2386d5586ebcf562e16d44b218d2a0fb338..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)


@@ -59,7 +66,7 @@ bool wxFileDirPickerCtrlBase::CreateBase(wxWindow *parent,
     wxASSERT_MSG(path.empty() || CheckPath(path), wxT("Invalid initial path!"));
 
     if (!wxPickerBase::CreateBase(parent, id, path, pos, size,
     wxASSERT_MSG(path.empty() || CheckPath(path), wxT("Invalid initial path!"));
 
     if (!wxPickerBase::CreateBase(parent, id, path, pos, size,

-                                   style, validator, name, wxTE_FILENAME))
+                                   style, validator, name))

         return false;
 
     if (!HasFlag(wxFLP_OPEN) && !HasFlag(wxFLP_SAVE))
         return false;
 
     if (!HasFlag(wxFLP_OPEN) && !HasFlag(wxFLP_SAVE))