Window management and sizer layout corrections

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

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 9f962768da121b5d9e2d4e0323a35ecbfe5b8ca7..5b0dacfef85deb62c8a8256a83dad48d894c1042 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -14,6 +14,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 #if defined(__WXMSW__)
     #if defined(__WIN16__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__) || !wxUSE_OLE
         #include "wx/generic/dirdlgg.h"
 #if defined(__WXMSW__)
     #if defined(__WIN16__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__) || !wxUSE_OLE
         #include "wx/generic/dirdlgg.h"

+        #define wxDirDialog wxGenericDirDialog

     #else
         #include "wx/msw/dirdlg.h"
     #endif
     #else
         #include "wx/msw/dirdlg.h"
     #endif


@@ -21,12 +22,14 @@ 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(__WXX11__)
+    #include "wx/generic/dirdlgg.h"

 #elif defined(__WXMGL__)
     #include "wx/generic/dirdlgg.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/dirdlg.h"
 #elif defined(__WXPM__)
 #elif defined(__WXMGL__)
     #include "wx/generic/dirdlgg.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/dirdlg.h"
 #elif defined(__WXPM__)

-    #include "wx/os2/dirdlg.h"
+    #include "wx/generic/dirdlgg.h"

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