Applied patch to add n bitmaps at once to an image

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

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 5b0dacfef85deb62c8a8256a83dad48d894c1042..7a849a713a657bfe4ff02773131fdb560adaff6c 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -1,47 +1,127 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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;
-
-#if defined(__WXMSW__)
-    #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__)
-    #include "wx/generic/dirdlgg.h"
-#elif defined(__WXGTK__)
-    #include "wx/generic/dirdlgg.h"
-#elif defined(__WXX11__)
+extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogDefaultFolderStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[];
+
+
+#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
+
+//-------------------------------------------------------------------------
+// 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) {}
+    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(__WXMSW__) && (defined(__WXUNIVERSAL__) || \
+                           defined(__SALFORDC__)    || \
+                           !wxUSE_OLE               || \
+                           (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS))
+

     #include "wx/generic/dirdlgg.h"
     #include "wx/generic/dirdlgg.h"

-#elif defined(__WXMGL__)
+    #define wxDirDialog wxGenericDirDialog
+
+// MS PocketPC or MS Smartphone
+#elif defined(__WXMSW__) && defined(__WXWINCE__) && !defined(__HANDHELDPC__)
+

     #include "wx/generic/dirdlgg.h"
     #include "wx/generic/dirdlgg.h"

+    #define wxDirDialog wxGenericDirDialog
+
+// Native MSW
+#elif defined(__WXMSW__)
+
+    #include "wx/msw/dirdlg.h"
+
+// Native GTK
+#elif defined(__WXGTK__)
+
+    #include "wx/gtk/dirdlg.h"
+    #define wxDirDialog wxDirDialogGTK
+
+// Native Mac

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

+

     #include "wx/mac/dirdlg.h"
     #include "wx/mac/dirdlg.h"

-#elif defined(__WXPM__)
+
+// 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"
     #include "wx/generic/dirdlgg.h"

+    #define wxDirDialog wxGenericDirDialog
+

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

-WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr;
-

 WXDLLEXPORT wxString
 wxDirSelector(const wxString& message = wxDirSelectorPromptStr,
               const wxString& defaultPath = wxEmptyString,
 WXDLLEXPORT wxString
 wxDirSelector(const wxString& message = wxDirSelectorPromptStr,
               const wxString& defaultPath = wxEmptyString,

-              long style = 0,
+              long style = wxDD_DEFAULT_STYLE,

               const wxPoint& pos = wxDefaultPosition,
               wxWindow *parent = NULL);
 
               const wxPoint& pos = wxDefaultPosition,
               wxWindow *parent = NULL);