Added wchar handling for EMX (gcc on OS/2).

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

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 63a01f17144a5b2a8f86e600c8042c864ed5358a..9f962768da121b5d9e2d4e0323a35ecbfe5b8ca7 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -12,7 +12,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__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__)
+    #if defined(__WIN16__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__) || !wxUSE_OLE

         #include "wx/generic/dirdlgg.h"
     #else
         #include "wx/msw/dirdlg.h"
         #include "wx/generic/dirdlgg.h"
     #else
         #include "wx/msw/dirdlg.h"


@@ -21,12 +21,12 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
     #include "wx/generic/dirdlgg.h"
 #elif defined(__WXGTK__)
     #include "wx/generic/dirdlgg.h"
     #include "wx/generic/dirdlgg.h"
 #elif defined(__WXGTK__)
     #include "wx/generic/dirdlgg.h"

+#elif defined(__WXMGL__)
+    #include "wx/generic/dirdlgg.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/dirdlg.h"
 #elif defined(__WXPM__)
     #include "wx/os2/dirdlg.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/dirdlg.h"
 #elif defined(__WXPM__)
     #include "wx/os2/dirdlg.h"

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/dirdlg.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------