Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
wxFileCtrl needs wxFileIconsTable too.

Closes #11064.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-08-03 20:45:07 +00:00
parent 3569e0d042
commit ad09ec03f2
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/generic/dirctrlg.h
View File

@@ -15,10 +15,6 @@
#ifndef _WX_DIRCTRL_H_ #ifndef _WX_DIRCTRL_H_
#define _WX_DIRCTRL_H_ #define _WX_DIRCTRL_H_
#if wxUSE_DIRDLG || wxUSE_FILEDLG
#include "wx/imaglist.h"
#endif
#if wxUSE_DIRDLG #if wxUSE_DIRDLG
#include "wx/treectrl.h" #include "wx/treectrl.h"
@@ -31,7 +27,6 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class WXDLLIMPEXP_FWD_CORE wxTextCtrl; class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxImageList;
class WXDLLIMPEXP_FWD_BASE wxHashTable; class WXDLLIMPEXP_FWD_BASE wxHashTable;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -264,7 +259,9 @@ protected:
// wxFileIconsTable - use wxTheFileIconsTable which is created as necessary // 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 class WXDLLIMPEXP_CORE wxFileIconsTable
{ {
@@ -298,7 +295,7 @@ protected:
// The global fileicons table // The global fileicons table
extern WXDLLIMPEXP_DATA_CORE(wxFileIconsTable *) wxTheFileIconsTable; extern WXDLLIMPEXP_DATA_CORE(wxFileIconsTable *) wxTheFileIconsTable;
#endif // wxUSE_DIRDLG || wxUSE_FILEDLG #endif // wxUSE_DIRDLG || wxUSE_FILEDLG || wxUSE_FILECTRL
#endif #endif
// _WX_DIRCTRLG_H_ // _WX_DIRCTRLG_H_