Added wxLOCALE_DATE/TIME_FMT support to wxLocale::GetInfo().

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

diff --git a/interface/wx/filectrl.h b/interface/wx/filectrl.h
index 72149989d554a93133fc3a9cdbb94b630a55ba21..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();


@@ -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.


@@ -206,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.