make wxSortedArrayString::Sort() and Insert() private in STL build (closes #10947)

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

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 9a7477102baab70b0a4109fe3f620be5cb038d03..fc86e195279895440271ccde224a4ef097729b4f 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -20,9 +20,9 @@
 // constants
 // ----------------------------------------------------------------------------
 
-extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[];
-extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogDefaultFolderStr[];
-extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxDirDialogNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxDirDialogDefaultFolderStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxDirSelectorPromptStr[];
 
 #define wxDD_CHANGE_DIR         0x0100
 #define wxDD_DIR_MUST_EXIST     0x0200
@@ -40,7 +40,7 @@ extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[];
 // wxDirDialogBase
 //-------------------------------------------------------------------------
 
-class WXDLLEXPORT wxDirDialogBase : public wxDialog
+class WXDLLIMPEXP_CORE wxDirDialogBase : public wxDialog
 {
 public:
     wxDirDialogBase() {}
@@ -73,6 +73,12 @@ public:
         return true;
     }
 
+#if WXWIN_COMPATIBILITY_2_6
+
+    wxDEPRECATED( long GetStyle() const );
+    wxDEPRECATED( void SetStyle(long style) );
+
+#endif  // WXWIN_COMPATIBILITY_2_6
 
     virtual void SetMessage(const wxString& message) { m_message = message; }
     virtual void SetPath(const wxString& path) { m_path = path; }
@@ -90,8 +96,7 @@ protected:
 #if defined(__WXUNIVERSAL__)
     #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog
-#elif defined(__WXMSW__) && (defined(__SALFORDC__)    || \
-                             !wxUSE_OLE               || \
+#elif defined(__WXMSW__) && (!wxUSE_OLE               || \
                              (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS))
     #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog
@@ -100,19 +105,20 @@ protected:
     #define wxDirDialog wxGenericDirDialog
 #elif defined(__WXMSW__)
     #include "wx/msw/dirdlg.h"  // Native MSW
-#elif defined(__WXGTK24__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/dirdlg.h"  // Native GTK for gtk2.4
 #elif defined(__WXGTK__)
     #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog
 #elif defined(__WXMAC__)
-    #include "wx/mac/dirdlg.h"      // Native Mac
+    #include "wx/osx/dirdlg.h"      // Native Mac
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/dirdlg.h"    // Native Cocoa
 #elif defined(__WXMOTIF__) || \
       defined(__WXX11__)   || \
       defined(__WXMGL__)   || \
       defined(__WXCOCOA__) || \
+      defined(__WXPALMOS__) || \
       defined(__WXPM__)
     #include "wx/generic/dirdlgg.h"     // Other ports use generic implementation
     #define wxDirDialog wxGenericDirDialog
@@ -122,7 +128,7 @@ protected:
 // common ::wxDirSelector() function
 // ----------------------------------------------------------------------------
 
-WXDLLEXPORT wxString
+WXDLLIMPEXP_CORE wxString
 wxDirSelector(const wxString& message = wxDirSelectorPromptStr,
               const wxString& defaultPath = wxEmptyString,
               long style = wxDD_DEFAULT_STYLE,