Fix crash when auto-sizing a wxDataViewCtrl column.

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

diff --git a/include/wx/generic/filectrlg.h b/include/wx/generic/filectrlg.h
index c2696f35ec7a2f7ebb58d14f5994fa89286e250d..ba26118d7f871b6b0ac30afaa1515d1bb2cec77c 100644 (file)
--- a/include/wx/generic/filectrlg.h
+++ b/include/wx/generic/filectrlg.h
@@ -4,7 +4,6 @@
 // Author:      Diaa M. Sami
 // Modified by:
 // Created:     Jul-07-2007
-// RCS-ID:      $Id$
 // Copyright:   (c) Diaa M. Sami
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -14,7 +13,7 @@
 
 #if wxUSE_FILECTRL
 
-#include "wx/panel.h"
+#include "wx/containr.h"
 #include "wx/listctrl.h"
 #include "wx/filectrl.h"
 #include "wx/filename.h"
@@ -24,13 +23,13 @@ class WXDLLIMPEXP_FWD_CORE wxChoice;
 class WXDLLIMPEXP_FWD_CORE wxStaticText;
 class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 
-extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorDefaultWildcardStr[];
 
 //-----------------------------------------------------------------------------
 //  wxFileData - a class to hold the file info for the wxFileListCtrl
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFileData
+class WXDLLIMPEXP_CORE wxFileData
 {
 public:
     enum fileType
@@ -125,7 +124,7 @@ private:
 //  wxFileListCtrl
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFileListCtrl : public wxListCtrl
+class WXDLLIMPEXP_CORE wxFileListCtrl : public wxListCtrl
 {
 public:
     wxFileListCtrl();
@@ -182,7 +181,7 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
-class WXDLLIMPEXP_CORE wxGenericFileCtrl : public wxPanel,
+class WXDLLIMPEXP_CORE wxGenericFileCtrl : public wxNavigationEnabled<wxControl>,
                                            public wxFileCtrlBase
 {
 public: