Last part from weak ref patch for event sink disconnection

[wxWidgets.git] / include / wx / generic / filectrlg.h

diff --git a/include/wx/generic/filectrlg.h b/include/wx/generic/filectrlg.h
index c508d2ed02119fa83ebca5e12d782cf0abce991d..c2696f35ec7a2f7ebb58d14f5994fa89286e250d 100644 (file)
--- a/include/wx/generic/filectrlg.h
+++ b/include/wx/generic/filectrlg.h
@@ -24,7 +24,7 @@ class WXDLLIMPEXP_FWD_CORE wxChoice;
 class WXDLLIMPEXP_FWD_CORE wxStaticText;
 class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 
 class WXDLLIMPEXP_FWD_CORE wxStaticText;
 class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 

-extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[];
+extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[];

 
 //-----------------------------------------------------------------------------
 //  wxFileData - a class to hold the file info for the wxFileListCtrl
 
 //-----------------------------------------------------------------------------
 //  wxFileData - a class to hold the file info for the wxFileListCtrl


@@ -275,7 +275,7 @@ private:
     // the first of these methods can only be used for the controls with single
     // selection (i.e. without wxFC_MULTIPLE style), the second one in any case
     wxFileName DoGetFileName() const;
     // the first of these methods can only be used for the controls with single
     // selection (i.e. without wxFC_MULTIPLE style), the second one in any case
     wxFileName DoGetFileName() const;

-    void DoGetFilenames( wxArrayString& filenames, const bool fullPath ) const;
+    void DoGetFilenames( wxArrayString& filenames, bool fullPath ) const;

 
     int m_style;
 
 
     int m_style;