X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d0bc78e2bf750babe62ea4af7df1d0252293e7d8..7921a093fac2c72b3e981caf1007d98ca767629d:/src/generic/dirctrlg.cpp?ds=inline diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index a41fdba627..c4bd8118b1 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -93,6 +93,8 @@ #include "dos.h" #endif +extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[]; + // If compiled under Windows, this macro can cause problems #ifdef GetFirstChild #undef GetFirstChild @@ -1328,7 +1330,7 @@ void wxDirFilterListCtrl::FillFilterList(const wxString& filter, int defaultFilt // wxFileIconsTable icons // ---------------------------------------------------------------------------- -#ifndef __WXGTK24__ +#ifndef __WXGTK20__ /* Computer (c) Julian Smart */ static const char * file_icons_tbl_computer_xpm[] = { /* columns rows colors chars-per-pixel */ @@ -1393,7 +1395,7 @@ static const char * file_icons_tbl_computer_xpm[] = { " dfffffffffffffd", " " }; -#endif // GTK+ < 2.4 +#endif // !GTK+ 2 // ---------------------------------------------------------------------------- // wxFileIconsTable & friends @@ -1462,7 +1464,7 @@ void wxFileIconsTable::Create() wxART_CMN_DIALOG, wxSize(16, 16))); // computer -#ifdef __WXGTK24__ +#ifdef __WXGTK20__ // GTK24 uses this icon in the file open dialog m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_HARDDISK, wxART_CMN_DIALOG,