In wxGTK2 the wxMessageDialog is not a real wxDialog so its m_widget

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

diff --git a/include/wx/msw/dirdlg.h b/include/wx/msw/dirdlg.h
index dc81929bcb366dc586429e1f1a83d70644bf5315..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_
 
 #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 wxChar*) wxFileSelectorPromptStr;
-

 class WXDLLEXPORT wxDirDialog : public wxDialog
 {
 public:
     wxDirDialog(wxWindow *parent,
 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 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);
 
     void SetMessage(const wxString& message) { m_message = message; }
     void SetPath(const wxString& path);

-    void SetStyle(long style) { m_dialogStyle = style; }
+    void SetStyle(long style) { SetWindowStyle(style); }

 
     wxString GetMessage() const { return m_message; }
     wxString GetPath() const { return m_path; }
 
     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;
 
     virtual int ShowModal();
 
 protected:
     wxString    m_message;

-    long        m_dialogStyle;

     wxString    m_path;
 
 private:
     wxString    m_path;
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxDirDialog)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDirDialog)

 };
 
 #endif
 };
 
 #endif