renamed wxRect::Inside() to wxRect::Contains(), wxRect::Inside(wxRect) is too confusing

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

diff --git a/include/wx/os2/dirdlg.h b/include/wx/os2/dirdlg.h
index 44f96238e2c21a0ce0046e0f1642d0cac1aa141e..250da8c5bbc3f7aa4ccf96094b897aa98e9e9d8b 100644 (file)
--- a/include/wx/os2/dirdlg.h
+++ b/include/wx/os2/dirdlg.h
@@ -1,48 +1,33 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dirdlg.h
 // Purpose:     wxDirDialog class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dirdlg.h
 // Purpose:     wxDirDialog class

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/14/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIRDLG_H_
 #define _WX_DIRDLG_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIRDLG_H_
 #define _WX_DIRDLG_H_
 

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

 #include "wx/dialog.h"
 
 #include "wx/dialog.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxFileSelectorPromptStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxFileSelectorPromptStr[];

 
 

-class WXDLLEXPORT wxDirDialog: public wxDialog
+class WXDLLEXPORT wxDirDialog: public wxDirDialogBase

 {
 {

-DECLARE_DYNAMIC_CLASS(wxDirDialog)
+    DECLARE_DYNAMIC_CLASS(wxDirDialog)

 public:
     wxDirDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr,
         const wxString& defaultPath = "",
         long style = 0, const wxPoint& pos = wxDefaultPosition);
 
 public:
     wxDirDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr,
         const wxString& defaultPath = "",
         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; }
-
-    inline wxString GetMessage() const { return m_message; }
-    inline wxString GetPath() const { return m_path; }
-    inline long GetStyle() const { return m_dialogStyle; }
-

     int ShowModal();
 
 protected:
     int ShowModal();
 
 protected:

-    wxString    m_message;
-    long        m_dialogStyle;

     wxWindow *  m_parent;
     wxWindow *  m_parent;

-    wxString    m_path;

 };
 
 #endif
 };
 
 #endif