don't use -single_module together with -bundle under Darwin (ld gives an error for...

[wxWidgets.git] / include / wx / generic / dirdlgg.h

diff --git a/include/wx/generic/dirdlgg.h b/include/wx/generic/dirdlgg.h
index 190b90e71549350ca0bbf932da825c169231f673..a71b15bf78af4d080b2f9493c35bcd1cbd0ff24e 100644 (file)
--- a/include/wx/generic/dirdlgg.h
+++ b/include/wx/generic/dirdlgg.h
@@ -15,21 +15,23 @@
 #ifndef _WX_DIRDLGG_H_
 #define _WX_DIRDLGG_H_
 
 #ifndef _WX_DIRDLGG_H_
 #define _WX_DIRDLGG_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "dirdlgg.h"
-#endif
-

 class WXDLLEXPORT wxGenericDirCtrl;
 class WXDLLEXPORT wxTextCtrl;
 class WXDLLEXPORT wxTreeEvent;
 
 // we may be included directly as well as from wx/dirdlg.h (FIXME)
 class WXDLLEXPORT wxGenericDirCtrl;
 class WXDLLEXPORT wxTextCtrl;
 class WXDLLEXPORT wxTreeEvent;
 
 // we may be included directly as well as from wx/dirdlg.h (FIXME)

-WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxDirDialogNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxDirSelectorPromptStr;

 #ifndef wxDD_DEFAULT_STYLE
 #ifndef wxDD_DEFAULT_STYLE

+
+#ifdef __WXWINCE__
+    #define wxDD_DEFAULT_STYLE \
+        (wxDEFAULT_DIALOG_STYLE | wxDD_NEW_DIR_BUTTON)
+#else

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

+#endif

 
 #include "wx/dialog.h"
 
 
 #include "wx/dialog.h"
 


@@ -82,6 +84,7 @@ protected:
     wxTextCtrl*       m_input;
 
     DECLARE_EVENT_TABLE()
     wxTextCtrl*       m_input;
 
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxGenericDirDialog)

 };
 
 #endif // _WX_DIRDLGG_H_
 };
 
 #endif // _WX_DIRDLGG_H_