1. added support for bitmaps with alpha channel

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

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 32fd5710ec7a96782707b6593eabdde530998b05..cee0581f21e27ccfe669b7138d174aff9fd31157 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -3,6 +3,8 @@
 
 #if wxUSE_DIRDLG
 
 
 #if wxUSE_DIRDLG
 

+#include "wx/dialog.h"
+

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -10,7 +12,6 @@
 WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr;

-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;

 
 #define wxDD_DEFAULT_STYLE \
     (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON)
 
 #define wxDD_DEFAULT_STYLE \
     (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON)


@@ -42,7 +43,7 @@ public:
 */
 
 #if defined(__WXMSW__)
 */
 
 #if defined(__WXMSW__)

-    #if defined(__WIN16__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__) || !wxUSE_OLE
+    #if defined(__WXWINCE__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__) || !wxUSE_OLE

         #include "wx/generic/dirdlgg.h"
         #define wxDirDialog wxGenericDirDialog
     #else
         #include "wx/generic/dirdlgg.h"
         #define wxDirDialog wxGenericDirDialog
     #else


@@ -58,6 +59,8 @@ public:
     #include "wx/generic/dirdlgg.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/dirdlg.h"
     #include "wx/generic/dirdlgg.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/dirdlg.h"

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

 #elif defined(__WXPM__)
     #include "wx/generic/dirdlgg.h"
 #endif
 #elif defined(__WXPM__)
     #include "wx/generic/dirdlgg.h"
 #endif