non virtual dtors warning fixes

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

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index c6f4454aac5b13f4f6ce7fa672ef7c9441da4388..fd84e5ae19a492c90ec39fb2de75e0b212eed89c 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -1,3 +1,14 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/dirdlg.h
+// Purpose:     wxDirDialog base class
+// Author:      Robert Roebling
+// Modified by:
+// Created:
+// Copyright:   (c) Robert Roebling
+// RCS-ID:      $Id$
+// Licence:     wxWindows Licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_DIRDLG_H_BASE_
 #define _WX_DIRDLG_H_BASE_
 
@@ -9,12 +20,18 @@
 // constants
 // ----------------------------------------------------------------------------
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogDefaultFolderStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[];
+
 
-#define wxDD_DEFAULT_STYLE \
-    (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON)
+#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
 
 /*
     The interface (TODO: make the other classes really derive from it!) is
@@ -44,7 +61,6 @@ public:
 
 // Universal and non-port related switches with need for generic implementation
 #if defined(__WXMSW__) && (defined(__WXUNIVERSAL__) || \
-                           defined(__WXWINCE__)     || \
                            defined(__SALFORDC__)    || \
                            !wxUSE_OLE               || \
                            (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS))
@@ -52,6 +68,12 @@ public:
     #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog
 
+// MS PocketPC or MS Smartphone
+#elif defined(__WXMSW__) && defined(__WXWINCE__) && !defined(__HANDHELDPC__)
+
+    #include "wx/generic/dirdlgg.h"
+    #define wxDirDialog wxGenericDirDialog
+
 // Native MSW
 #elif defined(__WXMSW__)