don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h
index 29bff51af604bd3f67167833b248a49aac995dc5..b2ff47f63cc4cdeb23d38128c901b9e273bad1ea 100644 (file)
--- a/include/wx/generic/dirctrlg.h
+++ b/include/wx/generic/dirctrlg.h
@@ -51,14 +51,16 @@ enum
     // Use 3D borders on internal controls
     wxDIRCTRL_3D_INTERNAL    = 0x0080,
     // Editable labels
     // Use 3D borders on internal controls
     wxDIRCTRL_3D_INTERNAL    = 0x0080,
     // Editable labels

-    wxDIRCTRL_EDIT_LABELS    = 0x0100
+    wxDIRCTRL_EDIT_LABELS    = 0x0100,
+    // Allow multiple selection
+    wxDIRCTRL_MULTIPLE       = 0x0200

 };
 
 //-----------------------------------------------------------------------------
 // wxDirItemData
 //-----------------------------------------------------------------------------
 
 };
 
 //-----------------------------------------------------------------------------
 // wxDirItemData
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxDirItemData : public wxTreeItemData
+class WXDLLIMPEXP_CORE wxDirItemData : public wxTreeItemData

 {
 public:
     wxDirItemData(const wxString& path, const wxString& name, bool isDir);
 {
 public:
     wxDirItemData(const wxString& path, const wxString& name, bool isDir);


@@ -80,7 +82,7 @@ public:
 
 class WXDLLIMPEXP_FWD_CORE wxDirFilterListCtrl;
 
 
 class WXDLLIMPEXP_FWD_CORE wxDirFilterListCtrl;
 

-class WXDLLEXPORT wxGenericDirCtrl: public wxControl
+class WXDLLIMPEXP_CORE wxGenericDirCtrl: public wxControl

 {
 public:
     wxGenericDirCtrl();
 {
 public:
     wxGenericDirCtrl();


@@ -88,7 +90,7 @@ public:
               const wxString &dir = wxDirDialogDefaultFolderStr,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               const wxString &dir = wxDirDialogDefaultFolderStr,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,

-              long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER,
+              long style = wxDIRCTRL_3D_INTERNAL,

               const wxString& filter = wxEmptyString,
               int defaultFilter = 0,
               const wxString& name = wxTreeCtrlNameStr )
               const wxString& filter = wxEmptyString,
               int defaultFilter = 0,
               const wxString& name = wxTreeCtrlNameStr )


@@ -101,7 +103,7 @@ public:
               const wxString &dir = wxDirDialogDefaultFolderStr,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               const wxString &dir = wxDirDialogDefaultFolderStr,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,

-              long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER,
+              long style = wxDIRCTRL_3D_INTERNAL,

               const wxString& filter = wxEmptyString,
               int defaultFilter = 0,
               const wxString& name = wxTreeCtrlNameStr );
               const wxString& filter = wxEmptyString,
               int defaultFilter = 0,
               const wxString& name = wxTreeCtrlNameStr );


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

+    virtual void GetPaths(wxArrayString& paths) const;

 
     // Get selected filename path only (else empty string).
     // I.e. don't count a directory as a selection
     virtual wxString GetFilePath() 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 GetFilePaths(wxArrayString& paths) const;

     virtual void SetPath(const wxString& path);
 
     virtual void SetPath(const wxString& path);
 

+    virtual void SelectPath(const wxString& path, bool select = true);
+    virtual void SelectPaths(const wxArrayString& paths);
+

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


@@ -148,6 +155,8 @@ public:
     virtual wxTreeCtrl* GetTreeCtrl() const { return m_treeCtrl; }
     virtual wxDirFilterListCtrl* GetFilterListCtrl() const { return m_filterListCtrl; }
 
     virtual wxTreeCtrl* GetTreeCtrl() const { return m_treeCtrl; }
     virtual wxDirFilterListCtrl* GetFilterListCtrl() const { return m_filterListCtrl; }
 

+    virtual void UnselectAll();
+

     // Helper
     virtual void SetupSections();
 
     // Helper
     virtual void SetupSections();
 


@@ -166,6 +175,9 @@ public:
     // Collapse the entire tree
     virtual void CollapseTree();
 
     // Collapse the entire tree
     virtual void CollapseTree();
 

+    // overridden base class methods
+    virtual void SetFocus();
+

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


@@ -195,14 +207,14 @@ private:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxGenericDirCtrl)
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxGenericDirCtrl)

-    DECLARE_NO_COPY_CLASS(wxGenericDirCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxGenericDirCtrl);

 };
 
 //-----------------------------------------------------------------------------
 // wxDirFilterListCtrl
 //-----------------------------------------------------------------------------
 
 };
 
 //-----------------------------------------------------------------------------
 // wxDirFilterListCtrl
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxDirFilterListCtrl: public wxChoice
+class WXDLLIMPEXP_CORE wxDirFilterListCtrl: public wxChoice

 {
 public:
     wxDirFilterListCtrl() { Init(); }
 {
 public:
     wxDirFilterListCtrl() { Init(); }


@@ -235,7 +247,7 @@ protected:
 
     DECLARE_EVENT_TABLE()
     DECLARE_CLASS(wxDirFilterListCtrl)
 
     DECLARE_EVENT_TABLE()
     DECLARE_CLASS(wxDirFilterListCtrl)

-    DECLARE_NO_COPY_CLASS(wxDirFilterListCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxDirFilterListCtrl);

 };
 
 #if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXPM__)
 };
 
 #if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXPM__)


@@ -254,7 +266,7 @@ protected:
 
 #if wxUSE_DIRDLG || wxUSE_FILEDLG
 
 
 #if wxUSE_DIRDLG || wxUSE_FILEDLG
 

-class WXDLLEXPORT wxFileIconsTable
+class WXDLLIMPEXP_CORE wxFileIconsTable

 {
 public:
     wxFileIconsTable();
 {
 public:
     wxFileIconsTable();


@@ -284,7 +296,7 @@ protected:
 };
 
 // The global fileicons table
 };
 
 // The global fileicons table

-extern WXDLLEXPORT_DATA(wxFileIconsTable *) wxTheFileIconsTable;
+extern WXDLLIMPEXP_DATA_CORE(wxFileIconsTable *) wxTheFileIconsTable;

 
 #endif // wxUSE_DIRDLG || wxUSE_FILEDLG
 
 
 #endif // wxUSE_DIRDLG || wxUSE_FILEDLG