removed redundant code

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

diff --git a/include/wx/msw/dirdlg.h b/include/wx/msw/dirdlg.h
index bbe29b3de56da2c09fb1524a4be8afe413068316..dc81929bcb366dc586429e1f1a83d70644bf5315 100644 (file)
--- a/include/wx/msw/dirdlg.h
+++ b/include/wx/msw/dirdlg.h
@@ -1,16 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxDirDialog class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Purpose:     wxDirDialog class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __DIRDLGH__
-#define __DIRDLGH__
+#ifndef _WX_DIRDLG_H_
+#define _WX_DIRDLG_H_

 
 #ifdef __GNUG__
 #pragma interface "dirdlg.h"
 
 #ifdef __GNUG__
 #pragma interface "dirdlg.h"


@@ -18,30 +18,35 @@
 
 #include "wx/dialog.h"
 
 
 #include "wx/dialog.h"
 

-class WXDLLEXPORT wxDirDialog: public wxDialog
+WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorPromptStr;
+
+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 = wxFileSelectorPromptStr,
+                const wxString& defaultPath = wxEmptyString,
+                long style = 0,
+                const wxPoint& pos = wxDefaultPosition);

 
 

-    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) { m_dialogStyle = 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 m_dialogStyle; }

 
 

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

 
 protected:
     wxString    m_message;
     long        m_dialogStyle;
 
 protected:
     wxString    m_message;
     long        m_dialogStyle;

-    wxWindow *  m_parent;

     wxString    m_path;
     wxString    m_path;

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxDirDialog)

 };
 
 #endif
 };
 
 #endif

-    // __DIRDLGH__
+    // _WX_DIRDLG_H_