removed WXWIN_COMPATIBILITY_2_4 in non-MSW code

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-07 11:48:53 +00:00
parent 56c6fc01a9
commit 39b61aa3eb
22 changed files with 2226 additions and 8309 deletions

View File

@@ -131,11 +131,6 @@ int wxFileDialog::ShowModal()
else
lFlags = FDS_OPEN_DIALOG;
#if WXWIN_COMPATIBILITY_2_4
if (m_windowStyle & wxHIDE_READONLY)
lFlags |= FDS_SAVEAS_DIALOG;
#endif
if (m_windowStyle & wxFD_SAVE)
lFlags |= FDS_SAVEAS_DIALOG;
if (m_windowStyle & wxFD_MULTIPLE)

View File

@@ -62,9 +62,6 @@ bool wxOS2Printer::Setup(wxWindow *WXUNUSED(parent))
// TODO:
/*
wxPrintDialog dialog(parent, & m_printData);
#if WXWIN_COMPATIBILITY_2_4
dialog.GetPrintData().SetSetupDialog(true);
#endif
return (dialog.ShowModal() == wxID_OK);
*/
return false;

View File

@@ -545,30 +545,6 @@ wxImageList* wxTreeCtrl::GetImageList () const
return m_pImageListNormal;
} // end of wxTreeCtrl::GetImageList
#if WXWIN_COMPATIBILITY_2_4
wxImageList* wxTreeCtrl::GetImageList(int nVal) const
{
return GetImageList();
}
void wxTreeCtrl::SetImageList(wxImageList* pImageList, int nVal)
{
SetImageList(pImageList);
}
int wxTreeCtrl::GetItemSelectedImage(const wxTreeItemId& rItem) const
{
return GetItemImage(rItem, wxTreeItemIcon_Selected);
}
void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& rItem, int nImage)
{
SetItemImage(rItem, nImage, wxTreeItemIcon_Selected);
}
#endif // WXWIN_COMPATIBILITY_2_4
wxImageList* wxTreeCtrl::GetStateImageList () const
{
return m_pImageListNormal;
@@ -1503,28 +1479,6 @@ wxTreeItemId wxTreeCtrl::DoInsertItem (
return wxTreeItemId((long)pRecord->m_ulItemId);
}
#if WXWIN_COMPATIBILITY_2_4
// for compatibility only
wxTreeItemId wxTreeCtrl::InsertItem (
const wxTreeItemId& rParent
, const wxString& rsText
, int nImage
, int nSelImage
, long lInsertAfter
)
{
return DoInsertItem( rParent
,wxTreeItemId(lInsertAfter)
,rsText
,nImage
,nSelImage
,NULL
);
} // end of wxTreeCtrl::InsertItem
#endif // WXWIN_COMPATIBILITY_2_4
wxTreeItemId wxTreeCtrl::AddRoot (
const wxString& rsText
, int nImage
@@ -1765,20 +1719,6 @@ void wxTreeCtrl::Toggle (
);
} // end of wxTreeCtrl::Toggle
#if WXWIN_COMPATIBILITY_2_4
void wxTreeCtrl::ExpandItem (
const wxTreeItemId& rItem
, int nAction
)
{
DoExpand( rItem
,nAction
);
} // end of wxTreeCtrl::ExpandItem
#endif // WXWIN_COMPATIBILITY_2_4
void wxTreeCtrl::Unselect ()
{
wxASSERT_MSG( !(m_windowStyle & wxTR_MULTIPLE),