undo the last change as it results in buildbot configuration error

[wxWidgets.git] / interface / wx / filepicker.h

diff --git a/interface/wx/filepicker.h b/interface/wx/filepicker.h
index 6fdd64aa5c2f6b6b916e6cedfe6a9c51b67d48ee..2e83658293f3652e4e411799099a9f0dfefde794 100644 (file)
--- a/interface/wx/filepicker.h
+++ b/interface/wx/filepicker.h
@@ -40,7 +40,7 @@
     @endStyleTable
 
 
     @endStyleTable
 
 

-    @beginEventTable{wxFileDirPickerEvent}
+    @beginEventEmissionTable{wxFileDirPickerEvent}

     @event{EVT_FILEPICKER_CHANGED(id, func)}
         The user changed the file selected in the control either using the
         button or using text control (see wxFLP_USE_TEXTCTRL; note that in
     @event{EVT_FILEPICKER_CHANGED(id, func)}
         The user changed the file selected in the control either using the
         button or using text control (see wxFLP_USE_TEXTCTRL; note that in


@@ -50,7 +50,7 @@
 
     @library{wxcore}
     @category{pickers}
 
     @library{wxcore}
     @category{pickers}

-    <!-- @appearance{filepickerctrl.png} -->
+    @appearance{filepickerctrl.png}

 
     @see wxFileDialog, wxFileDirPickerEvent
 */
 
     @see wxFileDialog, wxFileDirPickerEvent
 */


@@ -63,13 +63,13 @@ public:
     */
     wxFilePickerCtrl(wxWindow* parent, wxWindowID id,
                      const wxString& path = wxEmptyString,
     */
     wxFilePickerCtrl(wxWindow* parent, wxWindowID id,
                      const wxString& path = wxEmptyString,

-                     const wxString& message = "Select a file",
-                     const wxString& wildcard = ".",
+                     const wxString& message = wxFileSelectorPromptStr,
+                     const wxString& wildcard = wxFileSelectorDefaultWildcardStr,

                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxFLP_DEFAULT_STYLE,
                      const wxValidator& validator = wxDefaultValidator,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxFLP_DEFAULT_STYLE,
                      const wxValidator& validator = wxDefaultValidator,

-                     const wxString& name = "filepickerctrl");
+                     const wxString& name = wxFilePickerCtrlNameStr);

 
     /**
         Creates this widget with the given parameters.
 
     /**
         Creates this widget with the given parameters.


@@ -93,7 +93,7 @@ public:
         @param style
             The window style, see wxFLP_* flags.
         @param validator
         @param style
             The window style, see wxFLP_* flags.
         @param validator

-            Validator which can be used for additional date checks.
+            Validator which can be used for additional data checks.

         @param name
             Control name.
 
         @param name
             Control name.
 


@@ -102,13 +102,13 @@ public:
     */
     bool Create(wxWindow* parent, wxWindowID id,
                 const wxString& path = wxEmptyString,
     */
     bool Create(wxWindow* parent, wxWindowID id,
                 const wxString& path = wxEmptyString,

-                const wxString& message = "Select a file",
-                const wxString& wildcard = ".",
+                const wxString& message = wxFileSelectorPromptStr,
+                const wxString& wildcard = wxFileSelectorDefaultWildcardStr,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxFLP_DEFAULT_STYLE,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxFLP_DEFAULT_STYLE,
                 const wxValidator& validator = wxDefaultValidator,

-                const wxString& name = "filepickerctrl");
+                const wxString& name = wxFilePickerCtrlNameStr);

 
     /**
         Similar to GetPath() but returns the path of the currently selected
 
     /**
         Similar to GetPath() but returns the path of the currently selected


@@ -163,7 +163,7 @@ public:
            Change current working directory on each user directory selection change.
     @endStyleTable
 
            Change current working directory on each user directory selection change.
     @endStyleTable
 

-    @beginEventTable{wxFileDirPickerEvent}
+    @beginEventEmissionTable{wxFileDirPickerEvent}

     @event{EVT_DIRPICKER_CHANGED(id, func)}
         The user changed the directory selected in the control either using the
         button or using text control (see wxDIRP_USE_TEXTCTRL; note that in this
     @event{EVT_DIRPICKER_CHANGED(id, func)}
         The user changed the directory selected in the control either using the
         button or using text control (see wxDIRP_USE_TEXTCTRL; note that in this


@@ -174,7 +174,7 @@ public:
 
     @library{wxcore}
     @category{pickers}
 
     @library{wxcore}
     @category{pickers}

-    <!-- @appearance{dirpickerctrl.png} -->
+    @appearance{dirpickerctrl.png}

 
     @see wxDirDialog, wxFileDirPickerEvent
 */
 
     @see wxDirDialog, wxFileDirPickerEvent
 */


@@ -187,12 +187,12 @@ public:
     */
     wxDirPickerCtrl(wxWindow* parent, wxWindowID id,
                     const wxString& path = wxEmptyString,
     */
     wxDirPickerCtrl(wxWindow* parent, wxWindowID id,
                     const wxString& path = wxEmptyString,

-                    const wxString& message = "Select a folder",
+                    const wxString& message = wxDirSelectorPromptStr,

                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxDIRP_DEFAULT_STYLE,
                     const wxValidator& validator = wxDefaultValidator,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxDIRP_DEFAULT_STYLE,
                     const wxValidator& validator = wxDefaultValidator,

-                    const wxString& name = "dirpickerctrl");
+                    const wxString& name = wxDirPickerCtrlNameStr);

 
     /**
         Creates the widgets with the given parameters.
 
     /**
         Creates the widgets with the given parameters.


@@ -222,12 +222,12 @@ public:
     */
     bool Create(wxWindow* parent, wxWindowID id,
                 const wxString& path = wxEmptyString,
     */
     bool Create(wxWindow* parent, wxWindowID id,
                 const wxString& path = wxEmptyString,

-                const wxString& message = "Select a folder",
+                const wxString& message = wxDirSelectorPromptStr,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDIRP_DEFAULT_STYLE,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDIRP_DEFAULT_STYLE,
                 const wxValidator& validator = wxDefaultValidator,

-                const wxString& name = "dirpickerctrl");
+                const wxString& name = wxDirPickerCtrlNameStr);

 
     /**
         Returns the absolute path of the currently selected directory as a
 
     /**
         Returns the absolute path of the currently selected directory as a


@@ -282,7 +282,7 @@ public:
     */
     wxFileDirPickerEvent(wxEventType type, wxObject* generator,
                          int id,
     */
     wxFileDirPickerEvent(wxEventType type, wxObject* generator,
                          int id,

-                         const wxString path);
+                         const wxString& path);

 
     /**
         Retrieve the absolute path of the file/directory the user has just selected.
 
     /**
         Retrieve the absolute path of the file/directory the user has just selected.