Removed unnecessary code from utilsunx.cpp

[wxWidgets.git] / include / wx / dirdlg.h

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 5da68a5a45a98a012b7486ebd2f764db3eb6eaa5..7298d816121eca90be0e96264a0933f449c54902 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -1,8 +1,16 @@
 #ifndef _WX_DIRDLG_H_BASE_
 #define _WX_DIRDLG_H_BASE_
 
 #ifndef _WX_DIRDLG_H_BASE_
 #define _WX_DIRDLG_H_BASE_
 

+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
+

 #if defined(__WXMSW__)
 #if defined(__WXMSW__)

-#if defined(__WIN16__) || defined(__GNUWIN32__) || defined(__SALFORDC__)
+#if defined(__WIN16__) || (defined(__GNUWIN32__)&&!defined(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"