check for wxUSE_TIMER in headers, not the files including them

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

diff --git a/include/wx/mac/carbon/dirdlg.h b/include/wx/mac/carbon/dirdlg.h
index 06a4122af00b4f25d7624052b4bca27ba55722a6..5db3edc6bb002d292642ac4475ade05610b21a99 100644 (file)
--- a/include/wx/mac/carbon/dirdlg.h
+++ b/include/wx/mac/carbon/dirdlg.h
@@ -12,11 +12,7 @@
 #ifndef _WX_DIRDLG_H_
 #define _WX_DIRDLG_H_
 
 #ifndef _WX_DIRDLG_H_
 #define _WX_DIRDLG_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dirdlg.h"
-#endif
-
-class WXDLLEXPORT wxDirDialog : public wxDialog
+class WXDLLEXPORT wxDirDialog : public wxDirDialogBase

 {
 public:
     wxDirDialog(wxWindow *parent,
 {
 public:
     wxDirDialog(wxWindow *parent,


@@ -27,21 +23,10 @@ public:
                 const wxSize& size = wxDefaultSize,
                 const wxString& name = wxDirDialogNameStr);
 
                 const wxSize& size = wxDefaultSize,
                 const wxString& name = wxDirDialogNameStr);
 

-    void SetMessage(const wxString& message) { m_message = message; }
-    void SetPath(const wxString& path) { m_path = path; }
-    void SetStyle(long style) { m_dialogStyle = style; }
-
-    wxString GetMessage() const { return m_message; }
-    wxString GetPath() const { return m_path; }
-    long GetStyle() const { return m_dialogStyle; }
-

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

-    wxString    m_message;
-    long        m_dialogStyle;

     wxWindow *  m_parent;
     wxWindow *  m_parent;

-    wxString    m_path;

 
     DECLARE_DYNAMIC_CLASS(wxDirDialog)
 };
 
     DECLARE_DYNAMIC_CLASS(wxDirDialog)
 };