removing outdated code

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

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index e8c7e441001099a45bcd4943b0f871da71d06806..d02325f8f1d78f9370197293c617633af1fd8453 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -20,24 +20,27 @@
 // constants
 // ----------------------------------------------------------------------------
 
 // 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
+
+// deprecated, on by default now, use wxDD_DIR_MUST_EXIST to disable it
+#define wxDD_NEW_DIR_BUTTON     0

 
 #ifdef __WXWINCE__
 
 #ifdef __WXWINCE__

-    #define wxDD_DEFAULT_STYLE \
-        (wxDEFAULT_DIALOG_STYLE | wxDD_NEW_DIR_BUTTON)
+    #define wxDD_DEFAULT_STYLE      wxDEFAULT_DIALOG_STYLE

 #else
 #else

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

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

-class WXDLLEXPORT wxDirDialogBase : public wxDialog
+class WXDLLIMPEXP_CORE wxDirDialogBase : public wxDialog

 {
 public:
     wxDirDialogBase() {}
 {
 public:
     wxDirDialogBase() {}


@@ -70,6 +73,12 @@ public:
         return true;
     }
 
         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; }
 
     virtual void SetMessage(const wxString& message) { m_message = message; }
     virtual void SetPath(const wxString& path) { m_path = path; }


@@ -85,66 +94,39 @@ protected:
 
 // Universal and non-port related switches with need for generic implementation
 #if defined(__WXUNIVERSAL__)
 
 // Universal and non-port related switches with need for generic implementation
 #if defined(__WXUNIVERSAL__)

-

     #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog
     #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))
                              (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS))

-

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

-
-// MS PocketPC or MS Smartphone

 #elif defined(__WXMSW__) && defined(__WXWINCE__) && !defined(__HANDHELDPC__)
 #elif defined(__WXMSW__) && defined(__WXWINCE__) && !defined(__HANDHELDPC__)

-
-    #include "wx/generic/dirdlgg.h"
+    #include "wx/generic/dirdlgg.h"     // MS PocketPC or MS Smartphone

     #define wxDirDialog wxGenericDirDialog
     #define wxDirDialog wxGenericDirDialog

-
-// Native MSW

 #elif defined(__WXMSW__)
 #elif defined(__WXMSW__)

-
-    #include "wx/msw/dirdlg.h"
-
-// Native GTK for gtk2.x and generic for gtk1.x
+    #include "wx/msw/dirdlg.h"  // Native MSW
+#elif defined(__WXGTK20__)
+    #include "wx/gtk/dirdlg.h"  // Native GTK for gtk2.4

 #elif defined(__WXGTK__)
 #elif defined(__WXGTK__)

-
-#if defined( __WXGTK20__ )
-    #include "wx/gtk/dirdlg.h"
-    #define wxDirDialog wxDirDialogGTK
-#else

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

-#endif
-
-// Native Mac

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-
-    #include "wx/mac/dirdlg.h"
-
-// Native Cocoa
+    #include "wx/osx/dirdlg.h"      // Native Mac

 #elif defined(__WXCOCOA__)
 #elif defined(__WXCOCOA__)

-
-    #include "wx/cocoa/dirdlg.h"
-
-// Other ports use generic implementation
+    #include "wx/cocoa/dirdlg.h"    // Native Cocoa

 #elif defined(__WXMOTIF__) || \
       defined(__WXX11__)   || \
 #elif defined(__WXMOTIF__) || \
       defined(__WXX11__)   || \

-      defined(__WXMGL__)   || \

       defined(__WXCOCOA__) || \
       defined(__WXPM__)
       defined(__WXCOCOA__) || \
       defined(__WXPM__)

-
-    #include "wx/generic/dirdlgg.h"
+    #include "wx/generic/dirdlgg.h"     // Other ports use generic implementation

     #define wxDirDialog wxGenericDirDialog
     #define wxDirDialog wxGenericDirDialog

-

 #endif
 
 // ----------------------------------------------------------------------------
 // common ::wxDirSelector() function
 // ----------------------------------------------------------------------------
 
 #endif
 
 // ----------------------------------------------------------------------------
 // common ::wxDirSelector() function
 // ----------------------------------------------------------------------------
 

-WXDLLEXPORT wxString
+WXDLLIMPEXP_CORE wxString

 wxDirSelector(const wxString& message = wxDirSelectorPromptStr,
               const wxString& defaultPath = wxEmptyString,
               long style = wxDD_DEFAULT_STYLE,
 wxDirSelector(const wxString& message = wxDirSelectorPromptStr,
               const wxString& defaultPath = wxEmptyString,
               long style = wxDD_DEFAULT_STYLE,