Fixed some duff #ifdefs

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

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

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

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

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

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

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "dirdlg.h"
 #endif
 
 #pragma interface "dirdlg.h"
 #endif
 

-#include "wx/dialog.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxFileSelectorPromptStr;
-
-class WXDLLEXPORT wxDirDialog: public wxDialog
+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 = wxDirSelectorPromptStr,
+                const wxString& defaultPath = _T(""),
+                long style = 0,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                const wxString& name = wxDirDialogNameStr);

 
 

-    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) { m_path = path; }
+    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; }
+    wxString GetMessage() const { return m_message; }
+    wxString GetPath() const { return m_path; }
+    long GetStyle() const { return m_dialogStyle; }

 
 

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

 
 protected:
     wxString    m_message;
     long        m_dialogStyle;
     wxWindow *  m_parent;
     wxString    m_path;
 
 protected:
     wxString    m_message;
     long        m_dialogStyle;
     wxWindow *  m_parent;
     wxString    m_path;

+
+    DECLARE_DYNAMIC_CLASS(wxDirDialog)

 };
 
 #endif
 };
 
 #endif