wxUSE_PROPGRID is now recognized by source and header files

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

diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h
index 29bff51af604bd3f67167833b248a49aac995dc5..bd09b3c8a6fb4cd8209071a6458981259698873f 100644 (file)
--- a/include/wx/generic/dirctrlg.h
+++ b/include/wx/generic/dirctrlg.h
@@ -58,7 +58,7 @@ enum
 // 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 +80,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 +88,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 +101,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 );


@@ -166,6 +166,10 @@ 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);


@@ -202,7 +206,7 @@ private:
 // wxDirFilterListCtrl
 //-----------------------------------------------------------------------------
 
 // wxDirFilterListCtrl
 //-----------------------------------------------------------------------------
 

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

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


@@ -254,7 +258,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 +288,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