Better markup.

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

diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h
index 3dff3ffd8c57c916f473c995c05e6993426c1dc2..0c5627ca0861d31e7719bc1aea62e722e16b07e1 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) Robert Roebling, Harm van der Heijden, Julian Smart
 // Created:     21/3/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling, Harm van der Heijden, Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIRCTRL_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIRCTRL_H_


@@ -30,9 +30,9 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxTextCtrl;
-class WXDLLEXPORT wxImageList;
-class WXDLLEXPORT wxHashTable;
+class WXDLLIMPEXP_CORE wxTextCtrl;
+class WXDLLIMPEXP_CORE wxImageList;
+class WXDLLIMPEXP_BASE wxHashTable;

 
 //-----------------------------------------------------------------------------
 // Extra styles for wxGenericDirCtrl
 
 //-----------------------------------------------------------------------------
 // Extra styles for wxGenericDirCtrl


@@ -82,7 +82,7 @@ class WXDLLEXPORT wxGenericDirCtrl: public wxControl
 {
 public:
     wxGenericDirCtrl();
 {
 public:
     wxGenericDirCtrl();

-    wxGenericDirCtrl(wxWindow *parent, const wxWindowID id = -1,
+    wxGenericDirCtrl(wxWindow *parent, const wxWindowID id = wxID_ANY,

               const wxString &dir = wxDirDialogDefaultFolderStr,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               const wxString &dir = wxDirDialogDefaultFolderStr,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,


@@ -94,8 +94,8 @@ public:
         Init();
         Create(parent, id, dir, pos, size, style, filter, defaultFilter, name);
     }
         Init();
         Create(parent, id, dir, pos, size, style, filter, defaultFilter, name);
     }

-    
-    bool Create(wxWindow *parent, const wxWindowID id = -1,
+
+    bool Create(wxWindow *parent, const wxWindowID id = wxID_ANY,

               const wxString &dir = wxDirDialogDefaultFolderStr,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               const wxString &dir = wxDirDialogDefaultFolderStr,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,


@@ -124,12 +124,12 @@ public:
 
     // Get dir or filename
     virtual wxString GetPath() const;
 
     // Get dir or filename
     virtual wxString GetPath() const;

-    
+

     // Get selected filename path only (else empty string).
     // I.e. don't count a directory as a selection
     virtual wxString GetFilePath() const;
     virtual void SetPath(const wxString& path);
     // Get selected filename path only (else empty string).
     // I.e. don't count a directory as a selection
     virtual wxString GetFilePath() const;
     virtual void SetPath(const wxString& path);

-    
+

     virtual void ShowHidden( bool show );
     virtual bool GetShowHidden() { return m_showHidden; }
 
     virtual void ShowHidden( bool show );
     virtual bool GetShowHidden() { return m_showHidden; }
 


@@ -146,22 +146,24 @@ public:
 
     // Helper
     virtual void SetupSections();
 
     // Helper
     virtual void SetupSections();

-    
+
+#if WXWIN_COMPATIBILITY_2_4

     // Parse the filter into an array of filters and an array of descriptions
     virtual int ParseFilter(const wxString& filterStr, wxArrayString& filters, wxArrayString& descriptions);
     // Parse the filter into an array of filters and an array of descriptions
     virtual int ParseFilter(const wxString& filterStr, wxArrayString& filters, wxArrayString& descriptions);

-    
+#endif // WXWIN_COMPATIBILITY_2_4
+

     // Find the child that matches the first part of 'path'.
     // E.g. if a child path is "/usr" and 'path' is "/usr/include"
     // then the child for /usr is returned.
     // Find the child that matches the first part of 'path'.
     // E.g. if a child path is "/usr" and 'path' is "/usr/include"
     // then the child for /usr is returned.

-    // If the path string has been used (we're at the leaf), done is set to TRUE
+    // If the path string has been used (we're at the leaf), done is set to true

     virtual wxTreeItemId FindChild(wxTreeItemId parentId, const wxString& path, bool& done);
     virtual wxTreeItemId FindChild(wxTreeItemId parentId, const wxString& path, bool& done);

-    
+

     // Resize the components of the control
     virtual void DoResize();
     // Resize the components of the control
     virtual void DoResize();

-    
+

     // Collapse & expand the tree, thus re-creating it from scratch:
     virtual void ReCreateTree();
     // Collapse & expand the tree, thus re-creating it from scratch:
     virtual void ReCreateTree();

-    
+

 protected:
     virtual void ExpandDir(wxTreeItemId parentId);
     virtual void CollapseDir(wxTreeItemId parentId);
 protected:
     virtual void ExpandDir(wxTreeItemId parentId);
     virtual void CollapseDir(wxTreeItemId parentId);


@@ -200,7 +202,7 @@ class WXDLLEXPORT wxDirFilterListCtrl: public wxChoice
 {
 public:
     wxDirFilterListCtrl() { Init(); }
 {
 public:
     wxDirFilterListCtrl() { Init(); }

-    wxDirFilterListCtrl(wxGenericDirCtrl* parent, const wxWindowID id = -1,
+    wxDirFilterListCtrl(wxGenericDirCtrl* parent, const wxWindowID id = wxID_ANY,

               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0)
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0)


@@ -208,8 +210,8 @@ public:
         Init();
         Create(parent, id, pos, size, style);
     }
         Init();
         Create(parent, id, pos, size, style);
     }

-    
-    bool Create(wxGenericDirCtrl* parent, const wxWindowID id = -1,
+
+    bool Create(wxGenericDirCtrl* parent, const wxWindowID id = wxID_ANY,

               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0);
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0);