1. fixed typo ('&' instead of '|') in wxNotebook

[wxWidgets.git] / include / wx / generic / dirctrlg.h

diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h
index cfc86d1430a91bd74bb7abcca6a0e928632e208a..fe915fdc87b365dc5332e0c7e697318ca85fff9a 100644 (file)
--- a/include/wx/generic/dirctrlg.h
+++ b/include/wx/generic/dirctrlg.h
@@ -9,7 +9,7 @@
 // Created:     21/3/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIRCTRL_H_
@@ -19,6 +19,8 @@
 #pragma interface "dirctrlg.h"
 #endif
 
+#if wxUSE_DIRDLG
+
 #include "wx/treectrl.h"
 #include "wx/dirdlg.h"
 #include "wx/choice.h"
@@ -27,9 +29,6 @@
 // classes
 //-----------------------------------------------------------------------------
 
-//class wxDirItemData;
-class wxDirCtrl;
-
 //-----------------------------------------------------------------------------
 // Extra styles for wxGenericDirCtrl
 //-----------------------------------------------------------------------------
@@ -52,7 +51,6 @@ class WXDLLEXPORT wxDirItemDataEx : public wxTreeItemData
 public:
   wxDirItemDataEx(const wxString& path, const wxString& name, bool isDir);
   ~wxDirItemDataEx();
-  bool HasSubDirs();
   void SetNewDirName( wxString path );
   wxString m_path, m_name;
   bool m_isHidden;
@@ -111,9 +109,6 @@ public:
     inline wxString GetDefaultPath() const { return m_defaultPath; }
     void SetDefaultPath(const wxString& path) { m_defaultPath = path; }
 
-    //inline long GetStyleEx() const { return m_styleEx; }
-    //void SetStyleEx(long styleEx) { m_styleEx = styleEx; }
-
     // Get dir or filename
     wxString GetPath() const ;
     // Get selected filename path only (else empty string).
@@ -254,5 +249,7 @@ protected:
 
 };
 
+#endif // wxUSE_DIRDLG
+
 #endif
     // _WX_DIRCTRLG_H_