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

Separation of wxUSE_FILEDLG and wxUSE_DIRDLG in generic implementations.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-06-17 19:50:20 +00:00
parent d29bf6775a
commit 13de0c8c9b
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,10 @@
#pragma interface "dirctrlg.h" #pragma interface "dirctrlg.h"
#endif #endif
#if wxUSE_DIRDLG || wxUSE_FILEDLG
#include "wx/imaglist.h"
#endif
#if wxUSE_DIRDLG #if wxUSE_DIRDLG
#include "wx/treectrl.h" #include "wx/treectrl.h"
@@ -242,10 +246,14 @@ protected:
#define wxID_TREECTRL 7000 #define wxID_TREECTRL 7000
#define wxID_FILTERLISTCTRL 7001 #define wxID_FILTERLISTCTRL 7001
#endif // wxUSE_DIRDLG
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
// wxFileIconsTable - use wxTheFileIconsTable which is created as necessary // wxFileIconsTable - use wxTheFileIconsTable which is created as necessary
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
#if wxUSE_DIRDLG || wxUSE_FILEDLG
class WXDLLEXPORT wxFileIconsTable class WXDLLEXPORT wxFileIconsTable
{ {
public: public:
@@ -278,7 +286,7 @@ protected:
// The global fileicons table // The global fileicons table
WXDLLEXPORT_DATA(extern wxFileIconsTable *) wxTheFileIconsTable; WXDLLEXPORT_DATA(extern wxFileIconsTable *) wxTheFileIconsTable;
#endif // wxUSE_DIRDLG #endif // wxUSE_DIRDLG || wxUSE_FILEDLG
#endif #endif
// _WX_DIRCTRLG_H_ // _WX_DIRCTRLG_H_

12
src/generic/dirctrlg.cpp
View File

@@ -20,10 +20,9 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_DIRDLG #if wxUSE_DIRDLG || wxUSE_FILEDLG
#include "wx/generic/dirctrlg.h" #include "wx/generic/dirctrlg.h"
#include "wx/module.h" #include "wx/module.h"
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/button.h" #include "wx/button.h"
@@ -396,6 +395,11 @@ bool wxIsDriveAvailable(const wxString& dirName)
} }
#endif // __WINDOWS__ || __OS2__ #endif // __WINDOWS__ || __OS2__
#endif // wxUSE_DIRDLG || wxUSE_FILEDLG
#if wxUSE_DIRDLG
// Function which is called by quick sort. We want to override the default wxArrayString behaviour, // Function which is called by quick sort. We want to override the default wxArrayString behaviour,
// and sort regardless of case. // and sort regardless of case.
@@ -1270,7 +1274,9 @@ void wxDirFilterListCtrl::FillFilterList(const wxString& filter, int defaultFilt
SetSelection(defaultFilter); SetSelection(defaultFilter);
} }
} }
#endif // wxUSE_DIRDLG
#if wxUSE_DIRDLG || wxUSE_FILEDLG
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxFileIconsTable icons // wxFileIconsTable icons
@@ -1719,4 +1725,4 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
#endif // wxUSE_MIMETYPE/!wxUSE_MIMETYPE #endif // wxUSE_MIMETYPE/!wxUSE_MIMETYPE
} }
#endif // wxUSE_DIRDLG #endif // wxUSE_DIRDLG || wxUSE_FILEDLG