Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/os2/dirdlg.h b/include/wx/os2/dirdlg.h
index 96d885c31169b81618c7d9e135ccfa889a2e8685..8ddd29869dfd209300ca0af2b66cc4d8a3912919 100644 (file)
--- a/include/wx/os2/dirdlg.h
+++ b/include/wx/os2/dirdlg.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxDirDialog class
 // Author:      David Webster
 // Modified by:
 // Created:     10/14/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Purpose:     wxDirDialog class
 // Author:      David Webster
 // Modified by:
 // Created:     10/14/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

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


@@ -14,31 +14,20 @@
 
 #include "wx/dialog.h"
 
 
 #include "wx/dialog.h"
 

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

 
 

-class WXDLLEXPORT wxDirDialog: public wxDialog
+class WXDLLIMPEXP_CORE 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