projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added DECLARE_LOCAL_EVENT_TYPE which doesn't use WXDLLEXPORT. This is
[wxWidgets.git]
/
include
/
wx
/
dirdlg.h
diff --git
a/include/wx/dirdlg.h
b/include/wx/dirdlg.h
index 3f23e130474313e8da7f382083ae5c66d8121bce..4e93c93c65acc0efb45e8ebbd7173b3e95c6335b 100644
(file)
--- a/
include/wx/dirdlg.h
+++ b/
include/wx/dirdlg.h
@@
-10,7
+10,7
@@
WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
#if defined(__WXMSW__)
WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
#if defined(__WXMSW__)
-#if defined(__WIN16__) ||
defined(__GNUWIN32__
) || defined(__SALFORDC__)
+#if defined(__WIN16__) ||
(defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS
) || defined(__SALFORDC__)
#include "wx/generic/dirdlgg.h"
#else
#include "wx/msw/dirdlg.h"
#include "wx/generic/dirdlgg.h"
#else
#include "wx/msw/dirdlg.h"
@@
-22,7
+22,11
@@
WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
#elif defined(__WXQT__)
#include "wx/qt/dirdlg.h"
#elif defined(__WXMAC__)
#elif defined(__WXQT__)
#include "wx/qt/dirdlg.h"
#elif defined(__WXMAC__)
+#ifdef __WXMAC_X__
+#include "wx/generic/dirdlgg.h"
+#else
#include "wx/mac/dirdlg.h"
#include "wx/mac/dirdlg.h"
+#endif
#elif defined(__WXPM__)
#include "wx/os2/dirdlg.h"
#elif defined(__WXSTUBS__)
#elif defined(__WXPM__)
#include "wx/os2/dirdlg.h"
#elif defined(__WXSTUBS__)