explicit this-> is required by C++ standard, not g++, in WinStruct template

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

diff --git a/include/wx/msw/dirdlg.h b/include/wx/msw/dirdlg.h
index 7d78c2494f7855b4d17a4b8336b78a30ea07128d..bf31a0063a23a6a2ff3214938cf27fda70ac6e26 100644 (file)
--- a/include/wx/msw/dirdlg.h
+++ b/include/wx/msw/dirdlg.h
@@ -12,40 +12,37 @@
 #ifndef _WX_DIRDLG_H_
 #define _WX_DIRDLG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "dirdlg.h"
 #endif
 
-#include "wx/dialog.h"
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorPromptStr;
-
 class WXDLLEXPORT wxDirDialog : public wxDialog
 {
 public:
     wxDirDialog(wxWindow *parent,
-                const wxString& message = wxFileSelectorPromptStr,
+                const wxString& message = wxDirSelectorPromptStr,
                 const wxString& defaultPath = wxEmptyString,
                 long style = 0,
-                const wxPoint& pos = wxDefaultPosition);
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                const wxString& name = wxDirDialogNameStr);
 
     void SetMessage(const wxString& message) { m_message = message; }
-    void SetPath(const wxString& path) { m_path = path; }
-    void SetStyle(long style) { m_dialogStyle = style; }
+    void SetPath(const wxString& path);
+    void SetStyle(long style) { SetWindowStyle(style); }
 
     wxString GetMessage() const { return m_message; }
     wxString GetPath() const { return m_path; }
-    long GetStyle() const { return m_dialogStyle; }
+    long GetStyle() const { return GetWindowStyle(); }
 
     virtual int ShowModal();
 
 protected:
     wxString    m_message;
-    long        m_dialogStyle;
     wxString    m_path;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxDirDialog)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDirDialog)
 };
 
 #endif