X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63852e7836dd87f363eb5bd01af3ef05681a93bd..8aa4edd248534c4c1879c93d363d1b7fb8e8c5c6:/src/generic/dirdlgg.cpp diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp index db260cf827..da985fa3af 100644 --- a/src/generic/dirdlgg.cpp +++ b/src/generic/dirdlgg.cpp @@ -12,6 +12,13 @@ #pragma implementation "dirdlgg.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ +#pragma hdrstop +#endif + #include "wx/defs.h" #include "wx/utils.h" #include "wx/dialog.h" @@ -27,6 +34,11 @@ #include "wx/generic/dirdlgg.h" +// If compiled under Windows, this macro can cause problems +#ifdef GetFirstChild +#undef GetFirstChild +#endif + /* XPM */ static char * icon1_xpm[] = { /* width height ncolors chars_per_pixel */ @@ -126,8 +138,8 @@ class wxDirCtrl: public wxTreeCtrl const wxSize& size = wxDefaultSize, const long style = wxTR_HAS_BUTTONS, const wxString& name = "wxTreeCtrl" ); - void OnExpandItem( const wxTreeEvent &event ); - void OnCollapseItem( const wxTreeEvent &event ); + void OnExpandItem(wxTreeEvent &event ); + void OnCollapseItem(wxTreeEvent &event ); void ShowHidden( const bool yesno ); DECLARE_EVENT_TABLE() protected: @@ -235,7 +247,7 @@ void wxDirCtrl::CreateItems(const wxTreeItemId &parent) } } -void wxDirCtrl::OnExpandItem( const wxTreeEvent &event ) +void wxDirCtrl::OnExpandItem(wxTreeEvent &event ) { if (event.GetItem() == m_rootId) { @@ -273,7 +285,7 @@ void wxDirCtrl::OnExpandItem( const wxTreeEvent &event ) }; -void wxDirCtrl::OnCollapseItem( const wxTreeEvent &event ) +void wxDirCtrl::OnCollapseItem(wxTreeEvent &event ) { wxTreeItemId child, parent = event.GetItem(); long cookie; @@ -414,7 +426,7 @@ void wxDirDialog::OnTreeSelected( wxTreeEvent &event ) m_input->SetValue( *(data->m_path) ); }; -void wxDirDialog::OnTreeKeyDown( wxKeyEvent &WXUNUSED(event) ) +void wxDirDialog::OnTreeKeyDown( wxTreeEvent &WXUNUSED(event) ) { wxDirItemData *data = (wxDirItemData*)m_dir->GetItemData(m_dir->GetSelection());