unified wxTaskBarIcon behaviour: wxMSW version is not removed automatically when...

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

diff --git a/include/wx/msw/dirdlg.h b/include/wx/msw/dirdlg.h
index 5f8f7778ac67e667ae8be07a8f6eba55e5c73e0f..bf31a0063a23a6a2ff3214938cf27fda70ac6e26 100644 (file)
--- a/include/wx/msw/dirdlg.h
+++ b/include/wx/msw/dirdlg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dirdlg.h
+// Name:        wx/msw/dirdlg.h

 // Purpose:     wxDirDialog class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxDirDialog class
 // Author:      Julian Smart
 // Modified by:


@@ -12,37 +12,37 @@
 #ifndef _WX_DIRDLG_H_
 #define _WX_DIRDLG_H_
 
 #ifndef _WX_DIRDLG_H_
 #define _WX_DIRDLG_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "dirdlg.h"
 #endif
 
 #pragma interface "dirdlg.h"
 #endif
 

-#include "wx/dialog.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxFileSelectorPromptStr;
-
-class WXDLLEXPORT wxDirDialog: public wxDialog
+class WXDLLEXPORT wxDirDialog : public wxDialog

 {
 {

-DECLARE_DYNAMIC_CLASS(wxDirDialog)

 public:
 public:

-    wxDirDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr,
-        const wxString& defaultPath = "",
-        long style = 0, const wxPoint& pos = wxDefaultPosition);
+    wxDirDialog(wxWindow *parent,
+                const wxString& message = wxDirSelectorPromptStr,
+                const wxString& defaultPath = wxEmptyString,
+                long style = 0,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                const wxString& name = wxDirDialogNameStr);

 
 

-    inline void SetMessage(const wxString& message) { m_message = message; }
-    inline void SetPath(const wxString& path) { m_path = path; }
-    inline void SetStyle(long style) { m_dialogStyle = style; }
+    void SetMessage(const wxString& message) { m_message = message; }
+    void SetPath(const wxString& path);
+    void SetStyle(long style) { SetWindowStyle(style); }

 
 

-    inline wxString GetMessage(void) const { return m_message; }
-    inline wxString GetPath(void) const { return m_path; }
-    inline long GetStyle(void) const { return m_dialogStyle; }
+    wxString GetMessage() const { return m_message; }
+    wxString GetPath() const { return m_path; }
+    long GetStyle() const { return GetWindowStyle(); }

 
 

-    int ShowModal(void);
+    virtual int ShowModal();

 
 protected:
     wxString    m_message;
 
 protected:
     wxString    m_message;

-    long        m_dialogStyle;
-    wxWindow *  m_parent;

     wxString    m_path;
     wxString    m_path;

+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDirDialog)

 };
 
 #endif
 };
 
 #endif