Streamline wxSocket code: wxSocketBase now uses wxSocketImpl (previously known

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

diff --git a/include/wx/filectrl.h b/include/wx/filectrl.h
index b12a666d056ca55eff3777156d76c32bccee2761..3bf068e8a880fd44971c99170aa435e2ddb4435c 100644 (file)
--- a/include/wx/filectrl.h
+++ b/include/wx/filectrl.h
@@ -25,17 +25,15 @@ enum
     wxFC_OPEN              = 0x0001,
     wxFC_SAVE              = 0x0002,
     wxFC_MULTIPLE          = 0x0004,
-    wxFC_NOSHOWHIDDEN      = 0x0008,
+    wxFC_NOSHOWHIDDEN      = 0x0008
 };
 
 #define wxFC_DEFAULT_STYLE wxFC_OPEN
-extern WXDLLEXPORT_DATA( const wxChar ) wxFileCtrlNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxFileCtrlNameStr[]; // in filectrlcmn.cpp
 
-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EXPORTED_EVENT_TYPE( WXDLLIMPEXP_CORE, wxEVT_FILECTRL_SELECTIONCHANGED, 1150 )
-    DECLARE_EXPORTED_EVENT_TYPE( WXDLLIMPEXP_CORE, wxEVT_FILECTRL_FILEACTIVATED, 1151 )
-    DECLARE_EXPORTED_EVENT_TYPE( WXDLLIMPEXP_CORE, wxEVT_FILECTRL_FOLDERCHANGED, 1152 )
-END_DECLARE_EVENT_TYPES()
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_FILECTRL_SELECTIONCHANGED;
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_FILECTRL_FILEACTIVATED;
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_FILECTRL_FOLDERCHANGED;
 
 class WXDLLIMPEXP_CORE wxFileCtrlBase
 {
@@ -66,14 +64,14 @@ public:
     virtual int GetFilterIndex() const = 0;
 
     virtual bool HasMultipleFileSelection() const = 0;
-    virtual void ShowHidden(const bool show) = 0;
+    virtual void ShowHidden(bool show) = 0;
 };
 
 void GenerateFolderChangedEvent( wxFileCtrlBase *fileCtrl, wxWindow *wnd );
 void GenerateSelectionChangedEvent( wxFileCtrlBase *fileCtrl, wxWindow *wnd );
 void GenerateFileActivatedEvent( wxFileCtrlBase *fileCtrl, wxWindow *wnd, const wxString filename = wxEmptyString );
 
-#if defined(__WXGTK24__) && !defined(__WXUNIVERSAL__)
+#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
     #define wxFileCtrl wxGtkFileCtrl
     #include "wx/gtk/filectrl.h"
 #else
@@ -104,17 +102,17 @@ public:
     // no need for the copy constructor as the default one will be fine.
     virtual wxEvent *Clone() const { return new wxFileCtrlEvent( *this ); }
 
-    void SetFiles( const wxArrayString &files ) { this->files = files; }
-    void SetDirectory( const wxString &directory ) { this->directory = directory; }
+    void SetFiles( const wxArrayString &files ) { m_files = files; }
+    void SetDirectory( const wxString &directory ) { m_directory = directory; }
 
-    wxArrayString GetFiles() const { return files; }
-    wxString GetDirectory() const { return directory; }
+    wxArrayString GetFiles() const { return m_files; }
+    wxString GetDirectory() const { return m_directory; }
 
     wxString GetFile() const;
 
 protected:
-    wxString  directory;
-    wxArrayString files;
+    wxString m_directory;
+    wxArrayString m_files;
 
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN( wxFileCtrlEvent )
 };