A few tweaks and cleanups

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

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index e1216cc9ca0c2ca8e1562062b5638ec808a21248..bb9a22f36d16cea7141c936d94baccc76274b983 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -1,13 +1,51 @@
-#ifndef __DIRDLGH_BASE__
-#define __DIRDLGH_BASE__
+#ifndef _WX_DIRDLG_H_BASE_
+#define _WX_DIRDLG_H_BASE_
+
+#if wxUSE_DIRDLG
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;

 
 #if defined(__WXMSW__)
 
 #if defined(__WXMSW__)

-#include "wx/msw/dirdlg.h"
+    #if defined(__WIN16__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__) || !wxUSE_OLE
+        #include "wx/generic/dirdlgg.h"
+        #define wxDirDialog wxGenericDirDialog
+    #else
+        #include "wx/msw/dirdlg.h"
+    #endif

 #elif defined(__WXMOTIF__)
 #elif defined(__WXMOTIF__)

-#include "wx/xt/dirdlg.h"
+    #include "wx/generic/dirdlgg.h"

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

-#include "wx/gtk/dirdlg.h"
+    #include "wx/generic/dirdlgg.h"
+#elif defined(__WXX11__)
+    #include "wx/generic/dirdlgg.h"
+#elif defined(__WXMGL__)
+    #include "wx/generic/dirdlgg.h"
+#elif defined(__WXMAC__)
+    #include "wx/mac/dirdlg.h"
+#elif defined(__WXPM__)
+    #include "wx/generic/dirdlgg.h"

 #endif
 
 #endif
 

+// ----------------------------------------------------------------------------
+// common ::wxDirSelector() function
+// ----------------------------------------------------------------------------
+
+WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr;
+
+WXDLLEXPORT wxString
+wxDirSelector(const wxString& message = wxDirSelectorPromptStr,
+              const wxString& defaultPath = wxEmptyString,
+              long style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON,
+              const wxPoint& pos = wxDefaultPosition,
+              wxWindow *parent = NULL);
+
+#endif // wxUSE_DIRDLG
+

 #endif
 #endif

-    // __DIRDLGH_BASE__
+    // _WX_DIRDLG_H_BASE_