From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 3 Aug 2009 20:45:07 +0000 (+0000)
Subject: Compilation fix for wxUSE_FILECTRL && !(wxUSE_DIRDLG || wxUSE_FILEDLG).
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ad09ec03f20ca37083639c5d95ad586b32d13494

Compilation fix for wxUSE_FILECTRL && !(wxUSE_DIRDLG || wxUSE_FILEDLG).

wxFileCtrl needs wxFileIconsTable too.

Closes #11064.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h
index b2ff47f63c..8d9a3cef5d 100644
--- a/include/wx/generic/dirctrlg.h
+++ b/include/wx/generic/dirctrlg.h
@@ -15,10 +15,6 @@
 #ifndef _WX_DIRCTRL_H_
 #define _WX_DIRCTRL_H_
 
-#if wxUSE_DIRDLG || wxUSE_FILEDLG
-    #include "wx/imaglist.h"
-#endif
-
 #if wxUSE_DIRDLG
 
 #include "wx/treectrl.h"
@@ -31,7 +27,6 @@
 //-----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
-class WXDLLIMPEXP_FWD_CORE wxImageList;
 class WXDLLIMPEXP_FWD_BASE wxHashTable;
 
 //-----------------------------------------------------------------------------
@@ -264,7 +259,9 @@ protected:
 // wxFileIconsTable - use wxTheFileIconsTable which is created as necessary
 //-------------------------------------------------------------------------
 
-#if wxUSE_DIRDLG || wxUSE_FILEDLG
+#if wxUSE_DIRDLG || wxUSE_FILEDLG || wxUSE_FILECTRL
+
+class WXDLLIMPEXP_FWD_CORE wxImageList;
 
 class WXDLLIMPEXP_CORE wxFileIconsTable
 {
@@ -298,7 +295,7 @@ protected:
 // The global fileicons table
 extern WXDLLIMPEXP_DATA_CORE(wxFileIconsTable *) wxTheFileIconsTable;
 
-#endif // wxUSE_DIRDLG || wxUSE_FILEDLG
+#endif // wxUSE_DIRDLG || wxUSE_FILEDLG || wxUSE_FILECTRL
 
 #endif
     // _WX_DIRCTRLG_H_