allow windows which are placed inside wxStaticBoxes to be built as children of the...

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

diff --git a/interface/wx/filectrl.h b/interface/wx/filectrl.h
index 55a6214b73d99d8eea58ffccd38c4c6b63264de4..56be6351e86c3a1cefd72bd0ef7a3a7bb3425d9c 100644 (file)
--- a/interface/wx/filectrl.h
+++ b/interface/wx/filectrl.h
@@ -30,8 +30,7 @@
            Hides the "Show Hidden Files" checkbox (Generic only)
     @endStyleTable
 
            Hides the "Show Hidden Files" checkbox (Generic only)
     @endStyleTable
 

-
-    @beginEventTable{wxFileCtrlEvent}
+    @beginEventEmissionTable{wxFileCtrlEvent}

     @event{EVT_FILECTRL_FILEACTIVATED(id, func)}
         The user activated a file(by double-clicking or pressing Enter)
     @event{EVT_FILECTRL_SELECTIONCHANGED(id, func)}
     @event{EVT_FILECTRL_FILEACTIVATED(id, func)}
         The user activated a file(by double-clicking or pressing Enter)
     @event{EVT_FILECTRL_SELECTIONCHANGED(id, func)}


@@ -40,14 +39,15 @@
         The current folder of the file control has been changed
     @endEventTable
 
         The current folder of the file control has been changed
     @endEventTable
 

-    @nativeimpl{wxgtk}
-

     @library{wxbase}
     @library{wxbase}

-    @category{miscwnd}
+    @category{ctrl}
+    @appearance{filectrl.png}
+
+    @nativeimpl{wxgtk}

 
     @see wxGenericDirCtrl
 */
 
     @see wxGenericDirCtrl
 */

-class wxFileCtrl : public wxWindow
+class wxFileCtrl : public wxControl

 {
 public:
     wxFileCtrl();
 {
 public:
     wxFileCtrl();


@@ -60,12 +60,12 @@ public:
         @param id
             The identifier for the control.
         @param defaultDirectory
         @param id
             The identifier for the control.
         @param defaultDirectory

-            The initial directory shown in the control. Must be
-            a valid path to a directory or the empty string.
+            The initial directory shown in the control.
+            Must be a valid path to a directory or the empty string.

             In case it is the empty string, the current working directory is used.
         @param defaultFilename
             The default filename, or the empty string.
             In case it is the empty string, the current working directory is used.
         @param defaultFilename
             The default filename, or the empty string.

-        @param wildcard
+        @param wildCard

             A wildcard specifying which files can be selected,
             such as "*.*" or "BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif".
         @param style
             A wildcard specifying which files can be selected,
             such as "*.*" or "BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif".
         @param style


@@ -88,7 +88,7 @@ public:
                long style = wxFC_DEFAULT_STYLE,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = wxFC_DEFAULT_STYLE,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,

-               const wxString& name = "filectrl");
+               const wxString& name = wxFileCtrlNameStr);

 
     /**
         Create function for two-step construction. See wxFileCtrl() for details.
 
     /**
         Create function for two-step construction. See wxFileCtrl() for details.


@@ -96,11 +96,10 @@ public:
     bool Create(wxWindow* parent, wxWindowID id,
                 const wxString& defaultDirectory = wxEmptyString,
                 const wxString& defaultFilename = wxEmptyString,
     bool Create(wxWindow* parent, wxWindowID id,
                 const wxString& defaultDirectory = wxEmptyString,
                 const wxString& defaultFilename = wxEmptyString,

-                const wxPoint& wildCard = wxFileSelectorDefaultWildcardStr,
-                long style = wxFC_DEFAULT_STYLE,
-                const wxPoint& pos = wxDefaultPosition,
+                const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+                long style = wxFC_DEFAULT_STYLE, const wxPoint& pos = wxDefaultPosition,

                 const wxSize& size = wxDefaultSize,
                 const wxSize& size = wxDefaultSize,

-                const wxString& name = "filectrl");
+                const wxString& name = wxFileCtrlNameStr);

 
     /**
         Returns the current directory of the file control (i.e. the directory shown by it).
 
     /**
         Returns the current directory of the file control (i.e. the directory shown by it).


@@ -178,7 +177,7 @@ public:
     /**
         Sets whether hidden files and folders are shown or not.
     */
     /**
         Sets whether hidden files and folders are shown or not.
     */

-    void ShowHidden(const bool show);
+    virtual void ShowHidden(bool show);

 };
 
 
 };
 
 


@@ -207,7 +206,7 @@ public:
     /**
         Constructor.
     */
     /**
         Constructor.
     */

-    wxFileCtrlEvent(wxEventType type, wxObject evtObject, int id);
+    wxFileCtrlEvent(wxEventType type, wxObject *evtObject, int id);

 
     /**
         Returns the current directory.
 
     /**
         Returns the current directory.


@@ -233,7 +232,7 @@ public:
     /**
         Sets the files changed by this event.
     */
     /**
         Sets the files changed by this event.
     */

-    void SetFiles(const wxArrayString files);
+    void SetFiles(const wxArrayString& files);

 
 
     /**
 
 
     /**