correct access for virtuals

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

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 00a314639b2a6cbbb23c007f55ef20518f6ca759..401eeda50f531366e6253692addb46806d2e8f26 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -1,38 +1,141 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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_
 
 #if wxUSE_DIRDLG
 
 #ifndef _WX_DIRDLG_H_BASE_
 #define _WX_DIRDLG_H_BASE_
 
 #if wxUSE_DIRDLG
 

+#include "wx/dialog.h"
+

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
+extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogDefaultFolderStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[];
+

 
 

-#if defined(__WXMSW__)
-#if defined(__WIN16__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__)
-#include "wx/generic/dirdlgg.h"
+#ifdef __WXWINCE__
+    #define wxDD_DEFAULT_STYLE \
+        (wxDEFAULT_DIALOG_STYLE | wxDD_NEW_DIR_BUTTON)

 #else
 #else

-#include "wx/msw/dirdlg.h"
+    #define wxDD_DEFAULT_STYLE \
+        (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON)

 #endif
 #endif

-#elif defined(__WXMOTIF__)
-#include "wx/generic/dirdlgg.h"
+
+//-------------------------------------------------------------------------
+// wxDirDialogBase
+//-------------------------------------------------------------------------
+
+class WXDLLEXPORT wxDirDialogBase : public wxDialog
+{
+public:
+    wxDirDialogBase(wxWindow *parent,
+                    const wxString& title = wxDirSelectorPromptStr,
+                    const wxString& defaultPath = wxEmptyString,
+                    long style = wxDD_DEFAULT_STYLE,
+                    const wxPoint& pos = wxDefaultPosition,
+                    const wxSize& sz = wxDefaultSize,
+                    const wxString& name = wxDirDialogNameStr)
+        : wxDialog(parent, wxID_ANY, title, pos, sz, style, name)
+        , m_path(defaultPath)
+    {}
+    wxDirDialogBase() {}
+
+    virtual ~wxDirDialogBase() {}
+
+    virtual void SetMessage(const wxString& message) { m_message = message; }
+    virtual void SetPath(const wxString& path) { m_path = path; }
+    virtual void SetStyle(long style) { SetWindowStyle(style); }
+
+    virtual wxString GetMessage() const { return m_message; }
+    virtual wxString GetPath() const { return m_path; }
+    virtual long GetStyle() const { return GetWindowStyle(); }
+
+protected:
+    wxString m_message;
+    wxString m_path;
+};
+
+
+// Universal and non-port related switches with need for generic implementation
+#if defined(__WXUNIVERSAL__)
+
+    #include "wx/generic/dirdlgg.h"
+    #define wxDirDialog wxGenericDirDialog
+
+#elif defined(__WXMSW__) && (defined(__SALFORDC__)    || \
+                             !wxUSE_OLE               || \
+                             (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS))
+
+    #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__)
+
+    #include "wx/msw/dirdlg.h"
+
+// Native GTK for gtk2.x and generic for gtk1.x

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

-#include "wx/generic/dirdlgg.h"
-#elif defined(__WXMAC__)
-#ifdef __DARWIN__
-#include "wx/generic/dirdlgg.h"
+
+#if defined( __WXGTK20__ )
+    #include "wx/gtk/dirdlg.h"
+    #define wxDirDialog wxDirDialogGTK

 #else
 #else

-#include "wx/mac/dirdlg.h"
+    #include "wx/generic/dirdlgg.h"
+    #define wxDirDialog wxGenericDirDialog

 #endif
 #endif

-#elif defined(__WXPM__)
-#include "wx/os2/dirdlg.h"
-#elif defined(__WXSTUBS__)
-#include "wx/stubs/dirdlg.h"
+
+// Native Mac
+#elif defined(__WXMAC__)
+
+    #include "wx/mac/dirdlg.h"
+
+// Native Cocoa
+#elif defined(__WXCOCOA__)
+
+    #include "wx/cocoa/dirdlg.h"
+
+// Other ports use generic implementation
+#elif defined(__WXMOTIF__) || \
+      defined(__WXX11__)   || \
+      defined(__WXMGL__)   || \
+      defined(__WXCOCOA__) || \
+      defined(__WXPM__)
+
+    #include "wx/generic/dirdlgg.h"
+    #define wxDirDialog wxGenericDirDialog
+

 #endif
 
 #endif
 

+// ----------------------------------------------------------------------------
+// common ::wxDirSelector() function
+// ----------------------------------------------------------------------------
+
+WXDLLEXPORT wxString
+wxDirSelector(const wxString& message = wxDirSelectorPromptStr,
+              const wxString& defaultPath = wxEmptyString,
+              long style = wxDD_DEFAULT_STYLE,
+              const wxPoint& pos = wxDefaultPosition,
+              wxWindow *parent = NULL);
+

 #endif // wxUSE_DIRDLG
 
 #endif
 #endif // wxUSE_DIRDLG
 
 #endif